Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

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

@@ -24,7 +24,7 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
     */
    private String drugId;
    /**
     * 出货状态
     * 出货状态,1未出货，2已出货，3出货故障
     */
    private String status;
    /**
@@ -44,6 +44,52 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
     */
    private String description;
    /**
     * 名称
     */
    private String drugName;
    /**
     * 编码
     */
    private String drugCode;
    /**
     * 图片
     */
    private String pic;
    /**
     * 药品条码
     */
    private String drugBarCode;
    /**
     * 单位
     */
    private String unit;
    /**
     * 售价
     */
    private Float price;
    /**
     * 规格
     */
    private String specif;
    /**
     * 机构
     */
    private String orgCode;
    /**
     * 机构名称
     */
    private String orgName;
    public MedicineShipmentLog() {
    }
@@ -110,4 +156,76 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    public void setDescription(String description) {
        this.description = description;
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public String getPic() {
        return pic;
    }
    public void setPic(String pic) {
        this.pic = pic;
    }
    public String getDrugBarCode() {
        return drugBarCode;
    }
    public void setDrugBarCode(String drugBarCode) {
        this.drugBarCode = drugBarCode;
    }
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    public Float getPrice() {
        return price;
    }
    public void setPrice(Float price) {
        this.price = price;
    }
    public String getSpecif() {
        return specif;
    }
    public void setSpecif(String specif) {
        this.specif = specif;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
}

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

@@ -577,24 +577,33 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("msg", "orderId is null or empty");
            return result;
        }
        String sql = "SELECT\n" +
                "            t.id,\n" +
                "            t.device_id,\n" +
                "            t.order_id,\n" +
                "            t.drug_id,\n" +
                "            t.`status`,\n" +
                "            t.out_time,\n" +
                "            t.layer_no,\n" +
                "            t.wayer_no,\n" +
                "            t.description,\n" +
                "            t.create_time,\n" +
                "            t.create_user,\n" +
                "            t.create_user_name,\n" +
                "            t.update_time,\n" +
                "            t.update_user,\n" +
                "            t.update_user_name\n" +
                "        FROM\n" +
                "            t_medicine_shipment_log AS t \n" +
        String sql =  "SELECT\n" +
                "                t.id AS id,\n" +
                "                t.device_id AS deviceId,\n" +
                "                t.order_id AS orderId,\n" +
                "                t.drug_id AS drugId,\n" +
                "                t.`status` AS `status`,\n" +
                "                t.out_time AS outTime,\n" +
                "                t.layer_no AS layerNo,\n" +
                "                t.wayer_no AS wayerNo,\n" +
                "                t.description AS description,\n" +
                "                t.create_time AS createTime,\n" +
                "                t.create_user AS createUser,\n" +
                "                t.create_user_name AS createUserName,\n" +
                "                t.update_time AS updateTime,\n" +
                "                t.update_user AS updateUser,\n" +
                "                t.update_user_name AS updateUserName,\n" +
                "                t.drug_bar_code AS drugBarCode,\n" +
                "                t.drug_code AS drugCode,\n" +
                "                t.drug_name AS drugName,\n" +
                "                t.pic AS pic,\n" +
                "                t.price AS price,\n" +
                "                t.specif AS specif,\n" +
                "                t.unit AS unit,\n" +
                "                t.org_code AS orgCode,\n" +
                "                t.org_name AS orgName\n" +
                "            FROM\n" +
                "                t_medicine_shipment_log AS t" +
                "        WHERE \n" +
                "            t.order_id = '" + orderId + "'";
        List<Map<String,Object >> list = null;
@@ -628,6 +637,36 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        medicineShipmentLog.setStatus(status);
        shipmentLogDao.save(medicineShipmentLog);
        //表示已出货
        if ("2".equals(status)) {
            //更新药柜库存
            MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(
                    medicineShipmentLog.getDeviceId(),
                    medicineShipmentLog.getLayerNo(),
                    medicineShipmentLog.getWayerNo());
            inventory.setQty(String.valueOf(Integer.parseInt(inventory.getQty()) - 1));
            inventoryDao.save(inventory);
        }
        //查询更新订单信息start
        //订单id
        String orderId = medicineShipmentLog.getOrderId();
        String sql = "SELECT\n" +
                "\tcount(DISTINCT(id))\n" +
                "FROM\n" +
                "\tt_medicine_shipment_log\n" +
                "WHERE\n" +
                "\torder_id = '" + orderId + "'\n" +
                "AND `status` = 1\n" +
                "OR `status` = 3";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        if (count == 0) {
            Mediicineorder order = orderDao.findOne(orderId);
            order.setSellState("1");
            orderDao.save(order);
        }
        //end
        result.put("msg", ConstantUtils.SUCCESS);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
@@ -804,7 +843,16 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "\tt.create_user_name AS createUserName,\n" +
                    "\tt.update_time AS updateTime,\n" +
                    "\tt.update_user AS updateUser,\n" +
                    "\tt.update_user_name AS updateUserName\n" +
                    "\tt.update_user_name AS updateUserName,\n" +
                    "\tt.drug_bar_code AS drugBarCode,\n" +
                    "\tt.drug_code AS drugCode,\n" +
                    "\tt.drug_name AS drugName,\n" +
                    "\tt.pic AS pic,\n" +
                    "\tt.price AS price,\n" +
                    "\tt.specif AS specif,\n" +
                    "\tt.unit AS unit,\n" +
                    "\tt.org_code AS orgCode,\n" +
                    "\tt.org_name AS orgName\n" +
                    "FROM\n" +
                    "\tt_medicine_shipment_log AS t\n" +
                    "WHERE \n" +
@@ -848,6 +896,15 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        shipmentLog.setStatus("1");
                        shipmentLog.setLayerNo(objectMap.get("layerNo").toString());
                        shipmentLog.setWayerNo(objectMap.get("wayerNo").toString());
                        shipmentLog.setDrugBarCode(mediicinedrugs.getDrugBarCode());
                        shipmentLog.setDrugCode(mediicinedrugs.getDrugCode());
                        shipmentLog.setDrugName(mediicinedrugs.getDrugName());
                        shipmentLog.setOrgCode(mediicinedrugs.getOrgCode());
                        shipmentLog.setOrgName(mediicinedrugs.getOrgName());
                        shipmentLog.setPic(mediicinedrugs.getPic());
                        shipmentLog.setPrice(mediicinedrugs.getPrice());
                        shipmentLog.setSpecif(mediicinedrugs.getSpecif());
                        shipmentLog.setUnit(mediicinedrugs.getUnit());
                        shipmentLogDao.save(shipmentLog);
                        shipmentLogs.add(shipmentLog);
                    }