zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -116,11 +116,10 @@ Map<String, Object> param = new HashMap<>(); param.put("taskNo", task.getTaskNo()); param.put("siteNo", cacheSite.getSiteNo()); param.put("orderNo",cacheSite.getOrderNo()); wcsApiService.slapLightLogic(param); return R.ok(); return wcsApiService.slapLightLogic(param); } /** zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -347,7 +347,7 @@ public R slapLightLogic(Map<String, Object> request) { String taskNo = request.get("taskNo").toString(); String orderNo = request.get("orderNo").toString(); String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString(); List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo)); if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) { throw new CoolException("请打印明细，并绑定目标集货区"); @@ -376,21 +376,21 @@ // }).collect(Collectors.toList()); //判断数量是否与订单明细的需求量相同，相同则订单完成 if (one.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) { //播种完成，释放绑定站点 List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo)); for (CacheSite cacheSite : cacheSites) { if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) { cacheSite.setSiteStatus(CacheSiteStatusType.O.id); cacheSite.setOrderId(null); cacheSite.setBarcode(null); cacheSite.setOrderNo(null); cacheSite.setPlatformId(null); cacheSite.setPlatformNo(null); cacheSite.setUpdateTime(new Date()); if (!cacheSiteService.updateById(cacheSite)) { throw new CoolException("播种站点更新失败"); } //播种完成，释放绑定站点 List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>() .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo) .eq(CacheSite::getOrderNo, orderNo)); for (CacheSite cacheSite : cacheSites) { if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) { cacheSite.setSiteStatus(CacheSiteStatusType.O.id); cacheSite.setOrderId(null); cacheSite.setBarcode(null); cacheSite.setOrderNo(null); cacheSite.setPlatformId(null); cacheSite.setPlatformNo(null); cacheSite.setUpdateTime(new Date()); if (!cacheSiteService.updateById(cacheSite)) { throw new CoolException("播种站点更新失败"); } } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@ import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto; import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto; import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto; import com.zy.asrs.wms.asrs.entity.enums.OrderType; import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam; import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams; import com.zy.asrs.wms.asrs.service.MobileService; @@ -174,6 +175,12 @@ } /** * @author Ryan * @date 2025/6/25 * @description: 组托 * @version 1.0 */ @PostMapping("/comb/auth") public R combMats(@RequestBody BatchMergeOrdersParam ordersParam) { if (StringUtil.isNullOrEmpty(ordersParam.getOrderNo())) { @@ -187,11 +194,13 @@ } String str = ordersParam.getMergeNo().trim(); // CUT库条码T开头，截取后10位 // CTU库条码T开头，截取后10位 if (str.charAt(0) == 'T') { ordersParam.setMergeNo(str.substring(str.length() - 10)); } if (str.startsWith("PK")) { ordersParam.setInType(OrderType.PK_IN_ORDER.id); } boolean result = mobileService.batchMergeOrders(ordersParam); if (result) { return R.ok("组托成功！！"); @@ -295,7 +304,4 @@ } return mobileService.confirmShippingDetl(params); } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
@@ -13,6 +13,8 @@ private String orderNo; /**容器编码*/ private String mergeNo; /**入库类型： 平库， CTU库*/ private Long inType; /**需组托合并订单明细*/ private List<OrderInfoDto> orderDetls; } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -115,8 +115,9 @@ waitPakinService.comb(pakin); }); // UTC入库单据(非平库入库单据) if (order.getOrderType() != OrderType.PK_IN_ORDER.id) { if (!ordersParam.getInType().equals(OrderType.PK_IN_ORDER.id)) { /*** 项目下发流程 * 1. PDA组拖通知档* 2. 生成任务档* 3. 通过定时任务下发至ESS** */ //生成任务档 GeneratePakInParam generatePakInParam = new GeneratePakInParam(); zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -44,10 +44,10 @@ StringBuffer buffer = new StringBuffer(); buffer.append(orderNoRule.getOrderConst());//订单常量 String pattern = "yyyyMMddHHmmss"; if (orderNoRule.getTimeRule() == 0) { pattern = "yyyyMMdd"; } String pattern = "yyMMddHHmmss"; // if (orderNoRule.getTimeRule() == 0) { // pattern = "yyyyMMdd"; // } SimpleDateFormat format = new SimpleDateFormat(pattern); buffer.append(format.format(new Date()));//订单时间 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -172,7 +172,7 @@ * @description: 出库任务完成 * @version 1.0 */ @Scheduled(cron = "0/10 * * * * ? ") @Scheduled(cron = "0/35 * * * * ? ") @Transactional(rollbackFor = Exception.class) public void outExecute() { InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build()); zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -65,7 +65,7 @@ @Scheduled(cron = "0/30 * * * * ? ") @Transactional(rollbackFor = Exception.class) public void addWaveHistories() { List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id)); List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id)); if (tasks.isEmpty()) { return; }
