diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml index 41eeb72..cd46b55 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml @@ -92,7 +92,7 @@ AND class.class_code IN ('YL001','FL001','WBC001','NBC001','OTHER01') AND - (class.class_code = #{param.class_code} + class.class_code = #{param.class_code} @@ -101,7 +101,6 @@ mater.material_name LIKE #{param.material_code}) - ORDER BY mater.update_time Desc diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToNotCarServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToNotCarServiceImpl.java index 4bccfcd..8993da3 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToNotCarServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/WmsToNotCarServiceImpl.java @@ -38,7 +38,7 @@ public class WmsToNotCarServiceImpl implements WmsToNotCarService { if (ObjectUtil.isEmpty(isConnectCar)) { return NoCarResponse.requestError("系统参数表中：" + SysParamConstant.IS_NOT_CAR + "不存在"); } - if (isConnectCar.getValue().equals(IOSConstant.ONE)) { + if (isConnectCar.getValue().equals(IOSConstant.ZERO)) { return NoCarResponse.responseOk("下发成功，未连接无人车系统!"); } @@ -79,7 +79,7 @@ public class WmsToNotCarServiceImpl implements WmsToNotCarService { if (ObjectUtil.isEmpty(isConnectCar)) { return NoCarResponse.requestError("系统参数表中：" + SysParamConstant.IS_NOT_CAR + "不存在"); } - if (isConnectCar.getValue().equals(IOSConstant.ONE)) { + if (isConnectCar.getValue().equals(IOSConstant.ZERO)) { return NoCarResponse.responseOk("下发成功，未连接无人车系统!"); } @@ -120,7 +120,7 @@ public class WmsToNotCarServiceImpl implements WmsToNotCarService { if (ObjectUtil.isEmpty(isConnectCar)) { return NoCarResponse.requestError("系统参数表中：" + SysParamConstant.IS_NOT_CAR + "不存在"); } - if (isConnectCar.getValue().equals(IOSConstant.ONE)) { + if (isConnectCar.getValue().equals(IOSConstant.ZERO)) { return NoCarResponse.responseOk("下发成功，未连接无人车系统!"); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java index ad00aad..001405f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaNotCarController.java @@ -56,7 +56,7 @@ public class PdaNotCarController { @PostMapping("/queryZhPoint") @Log("无人车装货 - 二级页面查询（物料维护）") @SaIgnore - public ResponseEntity queryZhPoint(JSONObject whereJson) { + public ResponseEntity queryZhPoint(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(notCarService.queryZhPoint(whereJson), HttpStatus.OK); } @@ -116,5 +116,17 @@ public class PdaNotCarController { return new ResponseEntity<>(notCarService.sendTask(whereJson), HttpStatus.OK); } + @PostMapping("/queryIvtRegion") + @Log("卸货库存查询 - 查询区域下拉框") + @SaIgnore + public ResponseEntity queryIvtRegion() { + return new ResponseEntity<>(notCarService.queryIvtRegion(), HttpStatus.OK); + } + @PostMapping("/queryIvt") + @Log("卸货库存查询 - 查询库存") + @SaIgnore + public ResponseEntity queryIvt(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(notCarService.queryIvt(whereJson), HttpStatus.OK); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java index defc123..d6ab0e0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaNotCarService.java @@ -124,6 +124,23 @@ public interface PdaNotCarService { */ PdaResponse sendTask(JSONObject whereJson); + /** + * 卸货库存查询 - 查询区域下拉框 + * + * @return PdaResponse + */ + PdaResponse queryIvtRegion(); + + /** + * 卸货库存查询 - 查询库存 + * + * @param whereJson { + * region_code: 区域编码 + * } + * @return PdaResponse + */ + PdaResponse queryIvt(JSONObject whereJson); + /** * 公共 - 呼叫无人车 * diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java index 52ce818..d7cb9bd 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java @@ -150,7 +150,7 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { // 更新到达点位系统参数 Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_ARRIVE"); sysParamService.setValue(IOSConstant.ZERO); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); return PdaResponse.requestOk(); } @@ -232,7 +232,7 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { // 更新到达点位系统参数 Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_ARRIVE"); sysParamService.setValue(IOSConstant.ZERO); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); return PdaResponse.requestOk(); } @@ -290,7 +290,7 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { // ---------------校验车间空位--------------- if (wbClass > 0) { // 查询外包材空位 - List wbPointList = schBasePointMapper.getNoTaskPointByRegionAndType(IOSConstant.WBC001, IOSConstant.ONE, IOSConstant.ONE); + List wbPointList = schBasePointMapper.getNoTaskPointByRegionAndType(IOSConstant.AGVDJ01, IOSConstant.ONE, IOSConstant.ONE); if (wbClass > wbPointList.size()) { throw new BadRequestException("存放外包材空位不足,当前需要空位【" + wbClass + "】当前已有空位【" + wbPointList.size() + "】"); } @@ -306,18 +306,42 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { // 更新已到达点位系统参数：1-下发车间卸货任务 Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_ARRIVE"); sysParamService.setValue(IOSConstant.ONE); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); return PdaResponse.requestOk(); } @Override + public PdaResponse queryIvtRegion() { + return PdaResponse.requestParamOk(PDAEnum.REGION_CODE.getDict()); + } + + @Override + public PdaResponse queryIvt(JSONObject whereJson) { + String region_code = whereJson.getString("region_code"); + List list; + if (region_code.equals(IOSConstant.WXHHC01)) { + // 卸货缓存区 + list = schBasePointMapper.getUnLoadIvt(whereJson); + } else { + // 外包材区 + list = schBasePointMapper.getUnLoadIvtWbc(whereJson); + } + return PdaResponse.requestParamOk(list); + } + + @Override + @Transactional public void publicCallCar(JSONObject whereJson) { // 根据区域找对应的无人车对接点 String taskNo = IdUtil.getStringId(); // 将任务号存在系统中 Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NO_CAR_TASK"); + // 判断任务号是否为0 + if (!sysParamService.getValue().equals(IOSConstant.ZERO)) { + throw new BadRequestException("无人车正执行中!"); + } sysParamService.setValue(taskNo); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); JSONObject param = new JSONObject(); param.put("requestType", "WCS_101"); @@ -357,6 +381,9 @@ public class PdaNotCarServiceImpl implements PdaNotCarService { param.put("data", data); // 是否有成品配送 wmsToNotCarService.isGoBack(param); + // 更新任务号为 0 + sysParamService.setValue(IOSConstant.ZERO); + iSysParamService.update(sysParamService); } @Override diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java index 3c71ee1..c916ca9 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java @@ -43,6 +43,8 @@ public enum PDAEnum { // 物料类别 CLASS_TYPE(MapOf.of("原料", "YL001", "辅料", "FL001", "内包材", "NBC001", "外包材", "WBC001", "其他", "OTHER01")), + // 卸货库存查询-区域下拉框 + REGION_CODE(MapOf.of("外包材储存区", "AGVDJ01", "临时储存区", "LSCC01", "无人车卸货缓存区", "WXHHC01")), ; private Map code; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java index 7b0cd10..1eb0029 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/SchBasePoint.java @@ -133,6 +133,8 @@ public class SchBasePoint implements Serializable { private String material_id; + private String material_qty; + @TableField(exist = false) private List can_vehicle_types; @@ -152,8 +154,6 @@ public class SchBasePoint implements Serializable { @TableField(exist = false) private String device_code; @TableField(exist = false) - private String material_qty; - @TableField(exist = false) private String material_code; @TableField(exist = false) private String material_name; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java index f54630c..95334b5 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java @@ -81,4 +81,22 @@ public interface SchBasePointMapper extends BaseMapper { List getNoTaskPointByRegionAndTypeCp(String region, String type, String pointStatus); List getCRUsedDevice(); + + /** + * 手持：卸货库存查询 - 查询库存 + * @param whereJson { + * region_code: 区域编码 + * } + * @return List + */ + List getUnLoadIvt(@Param("param") JSONObject whereJson); + + /** + * 手持：卸货库存查询 - 查询库存 + * @param whereJson { + * region_code: 区域编码 + * } + * @return List + */ + List getUnLoadIvtWbc(@Param("param") JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml index 5601422..4cbcad5 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml @@ -139,6 +139,12 @@ IFNULL(point.material_id, '') != '' AND point.point_status != '1' AND point.region_code = 'WRC01' + AND 0 = (SELECT COUNT(*) + FROM sch_base_task t + WHERE t.is_delete = '0' + AND (t.point_code1 = point.point_code OR + t.point_code2 = point.point_code OR t.point_code3 = point.point_code OR t.point_code4 = point.point_code) + AND '5' > t.task_status) @@ -224,4 +230,55 @@ AND p.is_used = TRUE AND p.region_code = 'CRHCQ') + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarBackCpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarBackCpTask.java index 6eafdfe..afd0e3e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarBackCpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarBackCpTask.java @@ -189,7 +189,11 @@ public class NoCarBackCpTask extends AbstractTask { // 获取系统参数：无人车到达点位处理 Param sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_ARRIVE"); sysParamService.setValue(IOSConstant.ZERO); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); + // 更新任务号为0 + Param sysParamTask = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NO_CAR_TASK"); + sysParamTask.setValue(IOSConstant.ZERO); + iSysParamService.update(sysParamTask); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java index f5ecfe0..125826f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java @@ -178,6 +178,7 @@ public class NoCarUnloadTask extends AbstractTask { .set(SchBasePoint::getVehicle_code, "") .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空位")) .set(SchBasePoint::getMaterial_id, "") + .set(SchBasePoint::getMaterial_qty, "") ); // 更新终点 iSchBasePointService.update( @@ -218,7 +219,7 @@ public class NoCarUnloadTask extends AbstractTask { if (ObjectUtil.isNotEmpty(pointList)) { // 更新系统参数到达参数 sysParamService.setValue(IOSConstant.TWO); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); // 返回有成品配送 isGoBackParam.put("isGoback", IOSConstant.ZERO); pdaNotCarService.publicIsGoBack(isGoBackParam); @@ -233,7 +234,7 @@ public class NoCarUnloadTask extends AbstractTask { pdaNotCarService.publicIsGoBack(isGoBackParam); // 更新系统参数到达参数 sysParamService.setValue(IOSConstant.ZERO); - iSysParamService.updateById(sysParamService); + iSysParamService.update(sysParamService); } } }