From 6575ff94ec9ab3d2f5cb4155b422abe055b709f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 18:10:15 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |   86 +++++++++++++------------------------------
 1 files changed, 26 insertions(+), 60 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 9bfcfa4..25d03af 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -212,24 +212,6 @@
     }
 
     @Override
-    public R stockOutPrint(StockOutParam param, Long userId) {
-        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getOrderNo()));
-        Double total = 0.0D;
-        String custName = "";
-        for (Pakout pakout : pakouts) {
-            total = pakout.getAnfme() + total;
-            custName = pakout.getCustName();
-        }
-        StoPrintVo vo = new StoPrintVo();
-        vo.setDocNum(param.getOrderNo());
-        vo.setList(pakouts);
-        vo.setTotal(total);
-        vo.setCustName("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
-        vo.setWorkerName("闄嗘檽娑�");
-        return R.ok().add(vo);
-    }
-
-    @Override
     public R stockOutPreview(StockOutParam param, Long userId) {
         Order order = orderService.selectByOrderNo(param.getOrderNo());
         if (order.getSettle() != 1) {
@@ -239,21 +221,12 @@
         if (Cools.isEmpty(orderDetls)) {
             return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
         }
-        OrderStoDto dto = new OrderStoDto();
-        dto.setOrderNo(param.getOrderNo());
-        List<MatnrDto> matnrDtos = new ArrayList<>();
-        for (OrderDetl orderDetl : orderDetls) {
-            MatnrDto matnrDto = new MatnrDto();
-            matnrDto.setMatnr(orderDetl.getMatnr());
-            matnrDto.setCount(orderDetl.getAnfme());
-            matnrDtos.add(matnrDto);
-        }
-        dto.setDtos(matnrDtos);
+        OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
         return R.ok().add(mainService.stockOutPreview(dto));
     }
 
     @Override
-    public R stockOut(StockOutParam param, Long userId) {
+    public R stockOutCreate(StockOutParam param, Long userId) {
         Order order = orderService.selectByOrderNo(param.getOrderNo());
         if (order.getSettle() != 1) {
             return R.error("姝ゅ崟鎹棤娉曠敓鎴愭嫞璐у崟");
@@ -262,26 +235,37 @@
         if (Cools.isEmpty(orderDetls)) {
             return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
         }
-        OrderStoDto dto = new OrderStoDto();
-        dto.setOrderNo(param.getOrderNo());
-        List<MatnrDto> matnrDtos = new ArrayList<>();
-        for (OrderDetl orderDetl : orderDetls) {
-            MatnrDto matnrDto = new MatnrDto();
-            matnrDto.setMatnr(orderDetl.getMatnr());
-            matnrDto.setCount(orderDetl.getAnfme());
-            matnrDtos.add(matnrDto);
-        }
-        dto.setDtos(matnrDtos);
+        OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
         // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
         mainService.stockOutProcess(dto);
         return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
     }
 
     @Override
+    public R stockOutPrint(StockOutParam param, Long userId) {
+        Order order = orderService.selectByOrderNo(param.getOrderNo());
+        if (order == null) {
+            return R.error("姝ゅ崟鎹凡澶辨晥");
+        }
+        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", order.getOrderNo()));
+        Double total = 0.0D;
+        for (Pakout pakout : pakouts) {
+            total = pakout.getAnfme() + total;
+        }
+        StoPrintVo vo = new StoPrintVo();
+        vo.setDocNum(param.getOrderNo());
+        vo.setList(pakouts);
+        vo.setTotal(total);
+        vo.setCstmrName(order.getCstmrName());
+        vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
+        return R.ok().add(vo);
+    }
+
+    @Override
     @Transactional
     public R stockOutComplete(StockConfirmParam param, Long userId) {
         List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
-                .eq("doc_num", param.getNumber())
+                .eq("doc_num", param.getOrderNo())
                 .in("wrk_sts", 1, 2));
         for (Pakout pakout : pakouts) {
             LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
@@ -350,31 +334,13 @@
         }
 
         // 淇敼鍑哄簱鍗曠姸鎬�
-        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getOrderNo(), userId)) {
             return R.error("淇濆瓨鏁版嵁澶辫触");
         }
         // 淇敼鍗曟嵁鐘舵��
-        if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+        if (!orderService.updateSettle(param.getOrderNo(), 4L)) {
             throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
         }
-        // 閲囪喘閫�璐у崟
-//        if (param.getNumber().startsWith("PR-")) {
-            // erp鍗曟嵁涓婁紶 todo
-//            Long docId = pakouts.get(0).getDocId();
-//            if (null != docId) {
-//                List<BillDto> dtos = new ArrayList<>();
-//                for (Pakout pakout : pakouts) {
-//                    BillDto billDto = new BillDto();
-//                    billDto.setMatnr(pakout.getMatnr());
-//                    billDto.setQty(pakout.getAnfme());
-//                    dtos.add(billDto);
-//                }
-//                if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) {
-//                    throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
-//                }
-//            }
-
-//        }
         return R.ok();
     }
 

--
Gitblit v1.9.1