Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -208,6 +208,9 @@ public class BaseRequestMapping {
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
        public static final String  findMediicinecabinetInventoryByDeviceId = "/findMediicinecabinetInventoryByDeviceId";
        public static final String  updateMediicinecabineInventory = "/updateMediicinecabineInventory";
        public static final String selectMediicinecabineInventoryById="/selectMediicinecabineInventoryById";
        public static final String updateMediicinecabineInventoryInfoById = "/updateMediicinecabineInventoryInfoById";
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -400,5 +400,48 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(deviceService.selectById(deviceId));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateMediicinecabineInventory)
    @ApiOperation(value = "更换商品，或者设定商品" , notes="更换商品，或者设定商品")
    public Envelop updateMediicinecabineInventory(
            @ApiParam(name = "id", value = "货道id", required = true)
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "drugId", value = "药品id", required = true)
            @RequestParam(value = "drugId", required = true) String drugId,
            @ApiParam(name = "qty", value = "库存", required = true)
            @RequestParam(value = "qty", required = true) String qty) throws Exception {
        return success(deviceService.updateMediicinecabineInventoryById(id,drugId,qty));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.selectMediicinecabineInventoryById)
    @ApiOperation(value = "根据货道id获取单个货道详情" , notes="根据货道id获取单个货道详情")
    public Envelop selectMediicinecabineInventoryById(
            @ApiParam(name = "id", value = "货道id", required = true)
            @RequestParam(value = "id", required = true) String id) throws Exception {
        return success(deviceService.selectMediicinecabineInventoryById(id));
    }
    /**
     * 矫正库存\ 更新容量 \下架商品
     * @param id 货到id
     * @param qty 库存
     * @param cargoCapacity 容量
     * @param status 下架状态0
     * @return
     * @throws Exception
     */
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateMediicinecabineInventoryInfoById)
    @ApiOperation(value = "矫正库存\\ 更新容量 \\下架商品" , notes="矫正库存\\ 更新容量 \\下架商品")
    public Envelop updateMediicinecabineInventoryInfoById(
            @ApiParam(name = "id", value = "货道id", required = true)
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "qty", value = "库存", required = true)
            @RequestParam(value = "qty", required = false) String qty,
            @ApiParam(name = "cargoCapacity", value = "容量", required = true)
            @RequestParam(value = "cargoCapacity", required = false) String cargoCapacity,
            @ApiParam(name = "status", value = "下架状态0", required = true)
            @RequestParam(value = "status", required = false) String status) throws Exception {
        return success(deviceService.updateMediicinecabineInventoryInfoById(id,qty,cargoCapacity,status));
    }
}

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

@@ -46,9 +46,6 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MedicineDeviceDeliveryDao deviceDeliveryDao;
    @Autowired
    private MediicinecabinetInventoryDao inventoryDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -67,6 +64,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicinecabinetInventoryDao inventoryDao;
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
    @Transactional(rollbackFor = Exception.class)
@@ -1833,4 +1833,64 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return  array;
    }
    /**
     * 更换商品，或者设定商品
     * @param id
     * @param drugId
     * @param qty
     * @return
     * @throws Exception
     */
    public MediicinecabinetInventory updateMediicinecabineInventoryById(String id,String drugId,String qty) throws Exception {
        MediicinecabinetInventory inventory = inventoryDao.findOne(id);
        if (inventory==null){
            throw new Exception("不存在改货道！");
        }
        Mediicinedrugs mediicinedrugs = mediicinedrugsDao.findOne(drugId);
        inventory.setUpdateTime(new Date());
        inventory.setDrugCode(mediicinedrugs.getDrugCode());
        inventory.setDrugName(mediicinedrugs.getDrugName());
        inventory.setPrice(mediicinedrugs.getPrice()+"");
        inventory.setSku(mediicinedrugs.getDrugSku());
        inventory.setShelfStatus("1");
        inventory.setDrugId(drugId);
        inventory.setQty(qty);
        return inventoryDao.save(inventory);
    }
    /**
     * 根据货道id获取单个货道详情
     * @return
     * @throws Exception
     */
    public MediicinecabinetInventory selectMediicinecabineInventoryById(String id) throws Exception {
        return  inventoryDao.findOne(id);
    }
    /**
     * 矫正库存\ 更新容量 \下架商品
     * @param id 货到id
     * @param qty 库存
     * @param cargoCapacity 容量
     * @param status 下架状态0
     * @return
     * @throws Exception
     */
    public MediicinecabinetInventory updateMediicinecabineInventoryInfoById(String id,String qty,String cargoCapacity,String status) throws Exception {
        MediicinecabinetInventory inventory =  inventoryDao.findOne(id);
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(qty)){
            inventory.setQty(qty);
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(cargoCapacity)){
            inventory.setCargoCapacity(cargoCapacity);
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
            inventory.setShelfStatus(status);
        }
        inventory.setUpdateTime(new Date());
        return inventoryDao.save(inventory);
    }
}