*

lsh

18 小时以前 2b78f39309bf25641d8a050ab82fedd7cfb5b300

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -177,7 +177,6 @@
        if (wrkDetls.isEmpty()) {
            return SUCCESS;
        }
        String packageGroupNo;   //包装组号（徐工没有，只有箱号卷号一对一）  //null
        String outOrIn;   //out 出；in入；
        /*
         * 接口1=》不合格品出库二楼： 不合格品出库
@@ -210,6 +209,7 @@
        }
        for (WrkDetl wrkDetl : wrkDetls) {
            if (outOrIn.equals("out")){
                wrkDetl.setManu("成品出库");
                if (!Cools.isEmpty(stockType) && stockType.equals("盘点出库")){
                    wrkDetl.setManu("盘点出库");
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("不合格品出库")){
@@ -221,14 +221,14 @@
//                                packageGroupNo = order.getItemName();
                                wrkDetl.setDeadTime(order.getItemName());
                            }
                            wrkDetl.setManu(docType.getDocName$());
                            wrkDetl.setManu(docType.getDocName$(outOrIn));
                        } else {
                            wrkDetl.setManu("成品出库");
                        }
                    } else {
                        wrkDetl.setManu("成品出库");
                    }
                } else if (wrkDetl.getOrderNo().equals("不合格品出库")){
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("不合格品出库")){
                    wrkDetl.setManu("不合格品出库");
                }
            } else {
@@ -276,7 +276,7 @@
            try {
                // 保存接口日志
                apiLogService.save(
                        "成品库入库上报MES",
                        "成品库入出库上报MES",
                        productInventoryUrl+"/"+productInventory,
                        null,
                        "127.0.0.1",