|
@ -1545,7 +1545,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
mediicineorderdetail.setDrugCode(drugObj.getString("ITEM_CODE"));
|
|
|
mediicineorderdetail.setOrderNo(realOrder);
|
|
|
mediicineorderdetail.setPrice(drugObj.getFloat("ITEM_PRICE"));
|
|
|
mediicineorderdetail.setQuantity(quantity);
|
|
|
mediicineorderdetail.setQuantity(drugObj.getString("ITEM_QUANTITY_C_Q"));
|
|
|
mediicineorderdetail.setQuantityUnit(drugObj.getString("ITEM_QUANTITY_C_U"));
|
|
|
mediicineorderdetail.setGoodsName(drugObj.getString("ITEM_NAME"));
|
|
|
mediicineorderdetail.setOrderState("1");
|
|
|
mediicineorderdetail.setPickUpNum(realOrder);
|
|
@ -2495,8 +2496,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
|
|
|
shipmentLog.setPic(mediicinedrugs.getPic());
|
|
|
shipmentLog.setPrice(mediicinedrugs.getPrice());
|
|
|
shipmentLog.setSpecif(mediicinedrugs.getSpecif());
|
|
|
shipmentLog.setUnit(mediicinedrugs.getUnit());
|
|
|
shipmentLog.setQuantityUnit(mediicineorderdetail.getUnit());
|
|
|
shipmentLog.setUnit(mediicineorderdetail.getUnit());
|
|
|
shipmentLog.setQuantityUnit(mediicineorderdetail.getQuantityUnit());
|
|
|
String drugSql = " select quantity_unit,pack_unit from t_mediicine_drugs where org_code='"+mediicinedrugs.getOrgCode()+"' and drug_code='"+mediicinedrugs.getDrugCode()+"' ";
|
|
|
List<Map<String,Object>> drugTmps = jdbcTemplate.queryForList(drugSql);
|
|
|
if (drugTmps.size()>0){
|