WMS功能完善

pang.jiabao

2026-01-19 78b8f5141aa11bfa0f94361407ed43362c8852ce

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -7,6 +7,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MesServiceImpl;
import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -146,11 +147,11 @@
                // 回传托盘绑定的零件二维码
                String itemBarcode = orderDetl.getStandby1();
                List<String> itemBarCodeList = new ArrayList<>();
                Matcher matcher = Pattern.compile("\"([^\"]*)\"").matcher(itemBarcode);
                while (matcher.find()) {
                    itemBarCodeList.add(matcher.group(1));
                }
                item.setItemBarcode(itemBarCodeList);
//                Matcher matcher = Pattern.compile("\"([^\"]*)\"").matcher(itemBarcode);
//                while (matcher.find()) {
//                    itemBarCodeList.add(matcher.group(1));
//                }
                item.setItemBarcode(MesServiceImpl.barCodeStrToList(itemBarcode));
                list.add(item);
            }
            MesRecvFeedback mesRecvFeedback = new MesRecvFeedback();
@@ -159,15 +160,15 @@
            mesRecvFeedback.setItemdata(list);

            String url = MES_URL + "MaterialReceiptAndReturn";
//            String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesRecvFeedback));
//            if (!StringUtils.isEmpty(response) && response.contains("Success")) {
//                MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
//                if ("1".equals(mesReturn.getSuccess())) {
            String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(mesRecvFeedback));
            if (!StringUtils.isEmpty(response) && response.contains("Success")) {
                MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
                if ("1".equals(mesReturn.getSuccess())) {
                    orderPakin.setSettle(6L);
                    orderPakinService.updateById(orderPakin);
                    log.info("订单上报成功，orderNo={}", orderNo);
//                }
//            }
                }
            }
        }
    }