|
|
@ -676,7 +676,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 检查订单&返回订单出货单列表
|
|
|
* 检查订单&返回订单出货单列表 deviceId ---->equNum
|
|
|
* @param deviceId
|
|
|
* @param pickUpNum
|
|
|
* @param cardNum
|
|
|
@ -723,7 +723,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
"\t\t\tFROM\n" +
|
|
|
"\t\t\t\tt_mediicinecabinet_inventory t WHERE t.drug_code = '" + mediicineorderdetail.getDrugCode() + "'\n" +
|
|
|
"\t\t\tAND t.org_code = '" + mediicineorderdetail.getOrgCode() + "'\n" +
|
|
|
"\t\t\tAND t.id_device = '"+ deviceId + "'\n" +
|
|
|
"\t\t\tAND CONCAT(t.id_device, t.equ_num) like '%"+ deviceId + "%'\n" +
|
|
|
"\t\t\tGROUP BY\n" +
|
|
|
"\t\t\t\tt.drug_code,\n" +
|
|
|
"\t\t\t\tt.org_code\n" +
|
|
|
@ -812,7 +812,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
"WHERE\n" +
|
|
|
"\tt.drug_code = '"+ mediicineorderdetail.getDrugCode() +"'\n" +
|
|
|
"AND t.org_code = '" + mediicineorderdetail.getOrgCode() +"'\n" +
|
|
|
"AND t.id_device = '" + deviceId + "'\n" +
|
|
|
"AND CONCAT(t.id_device, t.equ_num) like '%"+ deviceId + "%'\n" +
|
|
|
"and t.qty > 0"
|
|
|
);
|
|
|
for (int i = 0; i < qty; i++) {
|
wangzhinan