|
|
@ -918,6 +918,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
" t.id,\n" +
|
|
|
" t.layer_no AS layerNo,\n" +
|
|
|
" t.wayer_no AS wayerNo,\n" +
|
|
|
" t.merge AS merge,\n" +
|
|
|
" t.qty\n" +
|
|
|
"FROM\n" +
|
|
|
"\tt_mediicinecabinet_inventory t\n" +
|
|
|
@ -925,6 +926,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
"\tt.drug_code = '"+ mediicineorderdetail.getDrugCode() +"'\n" +
|
|
|
"AND t.org_code = '" + mediicineorderdetail.getOrgCode() +"'\n" +
|
|
|
"AND CONCAT(t.id_device, t.equ_num) like '%"+ deviceId + "%'\n" +
|
|
|
"AND ( t.state = '1' or t.state = '21')\n" +
|
|
|
"and t.qty > 0"
|
|
|
);
|
|
|
for (int i = 0; i < qty; i++) {
|
|
|
@ -937,7 +939,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
shipmentLog.setDrugId(mediicinedrugs.getId());
|
|
|
shipmentLog.setStatus("1");
|
|
|
shipmentLog.setLayerNo(objectMap.get("layerNo").toString());
|
|
|
shipmentLog.setWayerNo(objectMap.get("wayerNo").toString());
|
|
|
shipmentLog.setWayerNo(objectMap.get("merge").toString());
|
|
|
shipmentLog.setDrugBarCode(mediicinedrugs.getDrugBarCode());
|
|
|
shipmentLog.setDrugCode(mediicinedrugs.getDrugCode());
|
|
|
shipmentLog.setDrugName(mediicinedrugs.getDrugName());
|
wangzhinan