#

Junjie

6 天以前 39bdfc374dcb4725c432106e97df9f77dd82e58a

 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java

@@ -91,6 +91,8 @@
                    detlDto = new DetlDto();
                    detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
                    detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
                    detlDto.setBatch(nccSaleXsfhmxWms.getVbatchcode());
                    detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
                    detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
                    detlDto.setLineNumber(i);
                    detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
@@ -99,10 +101,12 @@
                    i++;
                    nccSaleXsfhmxWms.setWmsFlag(1);
                    param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
                    param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
                }
                param.setOrderDetails(orderDetails);
                openService.pakoutOrderCreate(param);
                nccSaleXsfhmxWmsService.updateBatchById(map.get(key));
                size++;
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -129,6 +133,7 @@
                detlDto = new DetlDto();
                detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
                detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
                detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
                detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
                detlDto.setLineNumber(i);
                detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
@@ -167,6 +172,7 @@
                detlDto = new DetlDto();
                detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
                detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
                detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                detlDto.setLineNumber(i);
                detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -205,6 +211,7 @@
                detlDto = new DetlDto();
                detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
                detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
                detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                detlDto.setLineNumber(i);
                detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -242,6 +249,7 @@
                detlDto = new DetlDto();
                detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
                detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
                detlDto.setAnfme(nccCgCgdhdWms.getYdsl().doubleValue());
                detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
                detlDto.setLineNumber(i);
                detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
@@ -268,40 +276,40 @@
     *
     * @return
     */
    @Transactional
    public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
        try {
            InventoryCheckOrder param = new InventoryCheckOrder();
            InventoryCheckOrderDetl checkOrderDetl = null;
            for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
                log.info("NccCkPddWms数据:{}", JSONObject.toJSON(nccScZkmxbWms));
                Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(nccScZkmxbWms.getWlbm() + "编号商品检索失败，请先添加商品");
                }
                checkOrderDetl = new InventoryCheckOrderDetl();
                checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
                checkOrderDetl.setMaktx(mat.getMaktx());
                checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
                checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
                checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
                inventoryCheckOrderDetlService.insert(checkOrderDetl);
                nccScZkmxbWms.setWmsFlag(1);
                param.setOrderNo(nccScZkmxbWms.getVbillcode());
                param.setCreateBy(nccScZkmxbWms.getPdrmc());

            }
            param.setCreateTime(new Date());
            param.setStatus("1");
            inventoryCheckOrderService.insert(param);
            nccCkPddWmsService.updateBatchById(wmsFlag);
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }
//    @Transactional
//    public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
//        try {
//            InventoryCheckOrder param = new InventoryCheckOrder();
//            InventoryCheckOrderDetl checkOrderDetl = null;
//            for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
//                log.info("NccCkPddWms数据:{}", JSONObject.toJSON(nccScZkmxbWms));
//                Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
//                if (Cools.isEmpty(mat)) {
//                    throw new CoolException(nccScZkmxbWms.getWlbm() + "编号商品检索失败，请先添加商品");
//                }
//                checkOrderDetl = new InventoryCheckOrderDetl();
//                checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
//                checkOrderDetl.setMaktx(mat.getMaktx());
//                checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
//                checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
//                checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
//                inventoryCheckOrderDetlService.insert(checkOrderDetl);
//                nccScZkmxbWms.setWmsFlag(1);
//                param.setOrderNo(nccScZkmxbWms.getVbillcode());
//                param.setCreateBy(nccScZkmxbWms.getPdrmc());
//
//            }
//            param.setCreateTime(new Date());
//            param.setStatus("1");
//            inventoryCheckOrderService.insert(param);
//            nccCkPddWmsService.updateBatchById(wmsFlag);
//        } catch (Exception e) {
//            e.printStackTrace();
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//            return FAIL.setMsg(e.getMessage());
//        }
//        return SUCCESS;
//    }


    /**
@@ -322,6 +330,7 @@
                detlDto = new DetlDto();
                detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
                detlDto.setAnfme(nccCgCgdhdWms.getZsl().doubleValue());
                detlDto.setWeight(nccCgCgdhdWms.getFsl().doubleValue());
                detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
                detlDto.setLineNumber(i);
                detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));