新增，设备更新出货单出货图片 and 设备上报，更新设备货道状态，主要是更新设备货道状态--->故障

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

@@ -110,7 +110,10 @@ public class MediicinecabinetInventory extends UuidIdentityEntityWithOperator im
    private String merge;
    /**
     * 货道状态，1开启，0关闭，只针对出货的问题，初始化，默认开启，1、解绑设备，2、设备初始化两位置涉及到
     * 货道状态，1开启，0关闭，只针对出货的问题，2021-12-22，新增故障，状态为-1，表示该货道故障
     * 初始化，默认开启，1、解绑设备，2、设备初始化两位置涉及到
     * 货道关闭，不能出货，能补货，
     * 货道故障，不能出货、补货
     */
    private String cargoState;

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

@@ -226,6 +226,8 @@ public class BaseRequestMapping {
        public static final String selectMediicinecabineInventoryById="/selectMediicinecabineInventoryById";
        public static final String updateMediicinecabineInventoryInfoById = "/updateMediicinecabineInventoryInfoById";
        public static final String uploadDeviceInfo = "/uploadDeviceInfo";
        public static final String updateShipmentLogPic = "/updateShipmentLogPic";
        public static final String updateDeviceCargoState = "/updateDeviceCargoState";
        public static final String getDeviceList = "/getDeviceList";
        public static final String getDeviceInfo = "/getDeviceInfo";

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -287,4 +287,42 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return "上传失败";
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateShipmentLogPic)
    @ApiOperation(value = "更新出货单信息-出货图片")
    public String updateShipmentLogPic(
            @ApiParam(name = "shipmentLogId", value = "出货单id", required = true)
            @RequestParam(value = "shipmentLogId", required = true) String shipmentLogId,
            @ApiParam(name = "picPath", value = "图片路径", required = true)
            @RequestParam(value = "picPath") String picPath) throws Exception {
        if (StringUtils.isEmpty(shipmentLogId) || StringUtils.isEmpty(picPath)){
            return "参数缺失";
        }
        if (!deviceService.updateShipmentLogPic(shipmentLogId, picPath)) {
            return "更新失败";
        }
        return "更新成功";
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateDeviceCargoState)
    @ApiOperation(value = "更新设备货道状态")
    public String updateDeviceCargoState(
            @ApiParam(name = "equNum", value = "设备编号", required = true)
            @RequestParam(value = "equNum", required = true) String equNum,
            @ApiParam(name = "layerNo", value = "层", required = true)
            @RequestParam(value = "layerNo") String layerNo,
            @ApiParam(name = "wayerNo", value = "列", required = true)
            @RequestParam(value = "wayerNo") String wayerNo,
            @ApiParam(name = "state", value = "目标货道状态", required = true)
            @RequestParam(value = "state") String state) throws Exception {
        if (StringUtils.isEmpty(equNum) || StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(wayerNo) || StringUtils.isEmpty(state)){
            return "参数缺失";
        }
        if (!deviceService.updateDeviceCargoState(equNum, layerNo, wayerNo, state)) {
            return "更新失败";
        }
        return "更新成功";
    }
}

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

@@ -85,6 +85,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicineorderDao mediicineorderDao;
    @Autowired
    private MedicineShipmentLogDao medicineShipmentLogDao;
    /**
     * 设备出货服务，创建设备，创建库存内容
@@ -3854,4 +3857,41 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        object.put("drugTotal",quantity);
        return object;
    }
    /**
     * 更新出货单图片-出货图片
     * @param shipmentLogId
     * @param picPath
     * @return
     */
    public Boolean updateShipmentLogPic(String shipmentLogId, String picPath) {
        MedicineShipmentLog shipmentLog = medicineShipmentLogDao.findOne(shipmentLogId);
        if (shipmentLog == null) {
            return false;
        }
        shipmentLog.setPic(picPath);
        medicineShipmentLogDao.save(shipmentLog);
        return true;
    }
    /**
     * 更新设备货道状态
     * @param equNum
     * @param layerNo
     * @param wayerNo
     * @param state
     * @return
     */
    public Boolean updateDeviceCargoState(String equNum, String layerNo, String wayerNo, String state) {
        MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByEquNumAndLayerNoAndWayerNo(equNum, layerNo, wayerNo);
        if (inventory == null) {
            return false;
        }
        inventory.setState(state);
        inventoryDao.save(inventory);
        return true;
    }
}