rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -20,6 +20,7 @@ import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.mapper.*; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl; import com.vincent.rsf.server.system.constant.CodeRes; import com.vincent.rsf.server.system.constant.GlobalConfigCode; import com.vincent.rsf.server.system.constant.SerialRuleCode; @@ -127,6 +128,8 @@ private CompanysService companysService; @Autowired private OutStockService outStockService; @Autowired private BasContainerService basContainerService; /** * @return @@ -539,10 +542,24 @@ Object asnCode = params.get("asnCode"); Object crushNo = params.get("fieldsIndex"); Object batch = params.get("batch"); if (Objects.isNull(crushNo)) { throw new CoolException("票号不能为空！！"); } BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, params.get("barcode").toString())); if (Objects.isNull(container)) { throw new CoolException("容器不存在！！"); } if (!Objects.isNull(params.get("isHalf")) && !params.get("isHalf").equals("0")) { container.setIsHalf(1); if (!basContainerService.updateById(container)) { throw new CoolException("容器状态修改失败！！"); } } String fieldIndex = null; if (!Objects.isNull(crushNo)) { FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, crushNo).last("Limit 1")); if (!Objects.isNull(fieldsItem)) { fieldIndex = fieldsItem.getUuid(); } @@ -551,7 +568,7 @@ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>() .or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code) .or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch) .or().eq(!Cools.isEmpty(fieldIndex), WarehouseAreasItem::getFieldsIndex, fieldIndex) .or().eq(WarehouseAreasItem::getFieldsIndex, fieldIndex) .or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode) .or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode); List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper); rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -76,7 +76,6 @@ return R.error("任务出错，未查询到相关任务明细"); } return R.ok(taskItems); } @@ -326,7 +325,7 @@ if (!asnOrderService.updateById(order)) { throw new CoolException("订单数量更新失败！！"); } //检查单据是否完成 // //检查单据是否完成 // if (order.getAnfme().compareTo(order.getQty()) == 0) { // order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val); // if (!asnOrderService.updateById(order)) { rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java
@@ -54,6 +54,9 @@ @ApiModelProperty(value= "容器条码类型") private String codeType; @ApiModelProperty("是否满箱") private Integer isHalf; /** * 可入库区 */ rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.cfg.CoercionAction; import com.fasterxml.jackson.databind.cfg.CoercionInputShape; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.DateUtils; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; @@ -24,6 +25,7 @@ import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.manager.service.impl.LocServiceImpl; import com.vincent.rsf.server.manager.service.impl.WaveOrderRelaServiceImpl; import com.vincent.rsf.server.system.constant.GlobalConfigCode; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.entity.Config; @@ -95,6 +97,8 @@ private BasStationService basStationService; @Autowired private ReportMsgService reportMsgService; @Autowired private WaveOrderRelaService waveOrderRelaService; /** * @param @@ -575,7 +579,18 @@ } List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId())); //入库单据明细上报 // if (order.getType().equals(OrderType.ORDER_OUT.type)) { // try { // //上报已完成订单至ERP、MES等三方系统 // reportMsgService.reportOrders(order); // order.setReportOnce(order.getReportOnce() + 1); // if (!asnOrderService.updateById(order)) { // log.error(order.getCode() + "，单据上传次数修改失败！！"); // } // } catch (Exception e) { // log.error(e.getMessage()); // } // } if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) { for (TaskItem taskItem : taskItems) { if (Objects.isNull(taskItem.getOrderId())) { @@ -596,6 +611,37 @@ reportMsgService.reportOrderItem(wkOrderItem); } } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) { /**判断单据是否完成**/ Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet()); List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>() .in(WaveOrderRela::getWaveId, longSet)); if (Cools.isEmpty(waveOrderRelas)) { throw new CoolException("波次对应关联单未找到"); } Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet()); List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds); if (wkOrders.isEmpty()) { throw new CoolException("单据不存在！！"); } // Set<String> codes = taskItems.stream().map(TaskItem::getMatnrCode).collect(Collectors.toSet()); // List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() // .in(WkOrderItem::getMatnrCode, codes) // .in(WkOrderItem::getOrderId, orderIds)); if (!wkOrders.isEmpty()) { throw new CoolException("单据不存在！！"); } wkOrders.forEach(order -> { //检查单据是否完成 if (order.getAnfme().compareTo(order.getQty()) == 0) { order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val); if (!asnOrderService.updateById(order)) { throw new CoolException("出库单更新状态失败"); } } }); //出库单上报RCS修改库位状态 try { reportStationStatus(task); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -60,7 +60,6 @@ if (StringUtils.isBlank(waitPakin.getBarcode())) { throw new CoolException("参数错误：托盘码为空！！"); } // List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
@@ -11,11 +11,7 @@ matching-strategy: ANT_PATH_MATCHER datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: rsf username: root # url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # password: xltys1995 url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai password: 34821015 type: com.alibaba.druid.pool.DruidDataSource
