Merge branch 'medicare' of liubing/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MedicineShipmentLog.java

@@ -22,6 +22,10 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
     * 订单id
     */
    private String orderId;
    /**
     * 药品订单id
     */
    private String orderDetailId;
    /**
     * 药品id
     */
@@ -110,6 +114,14 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    private String quantityUnit;//每次用量单位
    private String packUnit;//包装数量单位
    public String getOrderDetailId() {
        return orderDetailId;
    }
    public void setOrderDetailId(String orderDetailId) {
        this.orderDetailId = orderDetailId;
    }
    public MedicineShipmentLog() {
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -759,6 +759,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        MedicineShipmentLog shipmentLog = new MedicineShipmentLog();
                        shipmentLog.setDeviceId(deviceId);
                        shipmentLog.setOrderId(stringObjectMap.get("idOrder").toString());
                        shipmentLog.setOrderDetailId(stringObjectMap.get("id").toString());
                        shipmentLog.setDrugId(mediicinedrugs.getId());
                        shipmentLog.setStatus("1");
                        shipmentLog.setLayerNo(objectMap.get("layerNo").toString());
@@ -1886,6 +1887,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        MedicineShipmentLog shipmentLog = new MedicineShipmentLog();
                        shipmentLog.setDeviceId(deviceId);
                        shipmentLog.setOrderId(mediicineorderdetail.getIdOrder());
                        shipmentLog.setOrderDetailId(mediicineorderdetail.getId());
                        shipmentLog.setDrugId(mediicinedrugs.getId());
                        shipmentLog.setStatus("1");
                        shipmentLog.setLayerNo(objectMap.get("layerNo").toString());
@@ -2303,7 +2305,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                //cargo_state = 1，货道开启的，药品才计入统计
                //求出该药品已出的数量
                String yichuyaoSql =  " select count(id) from t_medicine_shipment_log where order_id='"+order.getId()+"' " +
                        " and `status`=2 and drug_code='"+mediicineorderdetail.getDrugCode()+"' ";
                        " and `status`=2 and drug_code='"+mediicineorderdetail.getDrugCode()+"' and order_detail_id='"+mediicineorderdetail.getId()+"' ";
                Integer yichuyao = jdbcTemplate.queryForObject(yichuyaoSql,Integer.class);
                Integer weiquyaoTotal = Integer.parseInt(mediicineorderdetail.getQuantity())-yichuyao;
                if (weiquyaoTotal>0){
@@ -2397,7 +2399,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    Mediicinedrugs mediicinedrugs = drugsDao.findByDrugCodeAndOrgCode(mediicineorderdetail.getDrugCode(), mediicineorderdetail.getOrgCode());
                    String yichuyaoSql =  " select count(id) from t_medicine_shipment_log where order_id='"+order.getId()+"' " +
                            " and `status`=2 and drug_code='"+mediicineorderdetail.getDrugCode()+"' ";//求出该药品已出的数量
                            " and `status`=2 and drug_code='"+mediicineorderdetail.getDrugCode()+"' and order_detail_id='"+mediicineorderdetail.getId()+"' ";//求出该药品已出的数量
                    Integer yichuyao = jdbcTemplate.queryForObject(yichuyaoSql,Integer.class);
                    //订单药品数目
@@ -2435,6 +2437,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            MedicineShipmentLog shipmentLog = new MedicineShipmentLog();
                            shipmentLog.setDeviceId(deviceId);
                            shipmentLog.setOrderId(mediicineorderdetail.getIdOrder());
                            shipmentLog.setOrderDetailId(mediicineorderdetail.getId());
                            shipmentLog.setDrugId(mediicinedrugs.getId());
                            shipmentLog.setStatus("1");
                            shipmentLog.setLayerNo(stringObjectMap.get("layerNo").toString());