自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
pang.jiabao
1 天以前 aca94963ca944c256c4ef69d0316a2e8d6ccbc62 
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java


@@ -2,15 +2,18 @@




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.core.common.Cools;


import com.core.common.DateUtils;


import com.core.exception.CoolException;


import com.zy.asrs.entity.DocType;


import com.zy.asrs.entity.Order;


import com.zy.asrs.entity.OrderDetl;


import com.zy.asrs.entity.OrderReport;


import com.zy.asrs.entity.u8.ReportU8Vo;


import com.zy.asrs.entity.u8.U8ResultVo;


import com.zy.asrs.mapper.OrderMapper;


import com.zy.asrs.mapper.OrderReportMapper;


import com.zy.asrs.service.ApiLogService;


import com.zy.asrs.service.DocTypeService;


import com.zy.asrs.service.OrderDetlService;


@@ -51,7 +54,12 @@


    @Autowired


    private DocTypeService docTypeService;




    @Resource


    private OrderReportMapper orderReportMapper;




    private static final String baseUrl = "192.168.4.189:10006/api/U8Server";


//    private static final String baseUrl = "127.0.0.1:8080/jsjwms/open/asrs";




    private static final Map<String, String> pathMap = new HashMap<String, String>() {{


        put("采购到货单", "/purchasein_import");


        put("销售发货单", "/saleout_import");


@@ -59,6 +67,12 @@


        put("领料申请单", "/materialout_import");


        put("其他入库单", "/otherin_import");


        put("其他出库单", "/otherout_import");


//        put("采购到货单", "/purchasein_import");


//        put("销售发货单", "/purchasein_import");


//        put("生产订单", "/purchasein_import");


//        put("领料申请单", "/purchasein_import");


//        put("其他入库单", "/purchasein_import");


//        put("其他出库单", "/purchasein_import");


    }};


    @Resource


    private OrderMapper orderMapper;


@@ -176,6 +190,7 @@


        return SUCCESS;


    }




    @Transactional


    public void startNew(Map.Entry<String, List<Order>> orderMap) {


        String docName = orderMap.getKey();


        List<Order> value = orderMap.getValue();


@@ -205,6 +220,10 @@


                List<String> successReceiptNos = list.stream().filter(u8ResultVo -> "T".equals(u8ResultVo.getResult())).map(U8ResultVo::getReceiptNo).collect(Collectors.toList());


                if (!successReceiptNos.isEmpty()) {


                    orderMapper.batchUpdateSettleByOrderNos(successReceiptNos);


                    // 上报表转历史


                    orderReportMapper.moveToLog(successReceiptNos);


                    // 删除上报表数据


                    orderReportMapper.delete(new EntityWrapper<OrderReport>().in("order_no",successReceiptNos));


                    success = true;


                }


                log.info("单据上报成功，单据编号：{}", successReceiptNos);


@@ -252,14 +271,17 @@


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


                    String docType$ = order.getDocType$();


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                            item.setIquantity(orderReport.getAnfme());


                        item.setAutoidPo(orderDetl.getSku());


                        item.setPoautoidcol(docType$.equals("采购订单") ? "ID" : docType$.equals("采购到货单") || docType$.equals("委外到货单") ? "Autoid" :


                                docType$.equals("委外订单") ? "MODetailsID" : "");


                        item.setCbatch(orderDetl.getBatch());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                        }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


@@ -280,13 +302,16 @@


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


//                    String docType$ = order.getDocType$();


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                            item.setIquantity(orderReport.getAnfme());


                        item.setAutoidSo(orderDetl.getSku());


                        item.setSoautoidcol("IDLSID");


                        item.setCbatch(orderDetl.getBatch());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                        }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


@@ -306,13 +331,16 @@


                    List<ReportU8Vo.Item> itemList = new ArrayList<>();


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                            item.setIquantity(orderReport.getAnfme());


                        item.setAutoidMo(orderDetl.getSku());


                        item.setMoautoidcol("MODID");


                        item.setCbatch(orderDetl.getBatch());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                        }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


@@ -333,13 +361,16 @@


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


//                    String docType$ = order.getDocType$();


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                            item.setIquantity(orderReport.getAnfme());


                        item.setAutoidAll(orderDetl.getSku());


                        item.setAllcautoidcol("AutoID");


                        item.setCbatch(orderDetl.getBatch());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                        }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


@@ -359,11 +390,14 @@


                    List<ReportU8Vo.Item> itemList = new ArrayList<>();


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                        item.setCbatch(orderDetl.getBatch());


                            item.setIquantity(orderReport.getAnfme());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                        }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


@@ -383,12 +417,15 @@


                    List<ReportU8Vo.Item> itemList = new ArrayList<>();


                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());


                    for (OrderDetl orderDetl : orderDetlList) {


                        List<OrderReport> orderReports = orderReportMapper.selectSummary(orderDetl.getOrderNo(), orderDetl.getMatnr());


                        for(OrderReport orderReport: orderReports) {


                        ReportU8Vo.Item item = new ReportU8Vo.Item();


                        item.setCinvcode(orderDetl.getMatnr());


                        item.setIquantity(orderDetl.getQty());


                        item.setCbatch(orderDetl.getBatch());


                            item.setIquantity(orderReport.getAnfme());


                            item.setCbatch(orderReport.getBatch());


                        itemList.add(item);


                    }


                    }


                    reportU8Vo.setDetailList(itemList);


                    list.add(reportU8Vo);


                }