#

Junjie

6 天以前 4c7ab64e5a6bf855ece40e760ba7ad16cf6c367b

 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java

@@ -236,6 +236,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            process1 = e.getMessage();
        } finally {
            reportApiLog(null, process1, process1, response1, "TKRK", nyncIp, saveRefDelivery, success1);
        }
@@ -255,6 +256,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            process2 = e.getMessage();
        } finally {
            reportApiLog(null, process2, process2, response2, "DBRK", nyncIp, dbdd, success2);
        }
@@ -340,6 +342,7 @@
            saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
            saleOutBodyVO.setNshouldnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVO.setNnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVO.setCstateid(orderDetl.getCstateid());
            saleOutBodyVOList.add(saleOutBodyVO);
        }
        data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -409,7 +412,7 @@

        Double weight = MatUtils.calcWeight(matnr, anfme);
        iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
        iaIjBillB.setNassistnum(weight);
        iaIjBillB.setNassistnum(weight * -1);
        iaIjBillB.setNnum(anfme * -1);
        iaIjBillB.setVbatchcode(batch);
        iaIjBillB.setClocationid("");
@@ -417,7 +420,7 @@

        bids.add(iaIjBillB);

        data.put("hid", nccSaleDbddWms.getCbill_bid());
        data.put("hid", nccSaleDbddWms.getCbillid());
        data.put("bids", bids);
        return data;
    }
@@ -519,11 +522,6 @@
            IaIjBillB iaIjBillB = new IaIjBillB();
            String remark = orderDetl.getRemark();
            if (!Cools.isEmpty(remark)) {
                NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
                if (nccScPcdaWms == null) {
                    throw new CoolException("批次[{}]物料[{}]未找到" + orderDetl.getBatch() + "-" + orderDetl.getMatnr());
                }

                Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
                NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
                iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -531,7 +529,7 @@
                iaIjBillB.setNnum(orderDetl.getQty());
                iaIjBillB.setVbatchcode(orderDetl.getBatch());
                iaIjBillB.setClocationid("");
                iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
                iaIjBillB.setCstateid(orderDetl.getCstateidVcode());

                hid = nccSaleDbddWms.getCbillid();
            }