From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 14:05:20 +0800
Subject: [PATCH] 出库单管理

---
 consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java |  127 +++++++++++++++++++++++-------------------
 1 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index e493eaa..038b6ec 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -1,24 +1,29 @@
 package com.consum.base.service;
 
-import com.consum.base.Constants;
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.LWhFormOutputParam;
-import com.consum.base.pojo.LWhFormProcureParam;
-import com.consum.base.util.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
+import com.consum.base.pojo.LWFormsOutputGoodsParam;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @Description 鍑哄簱鍗�
@@ -30,6 +35,8 @@
 public class LWhFormOutputServiceImpl extends BaseServiceImpl {
 
     @Autowired
+    private CodeGeneratorService codeGeneratorService;
+    @Autowired
     private BaseWarehouseServiceImpl baseWarehouseService;
     @Autowired
     private LWhGoodsService lWhGoodsService;
@@ -37,9 +44,10 @@
     private LWhProcureModelService lWhProcureModelService;
     @Autowired
     private LWhFormOutputCoreService lWhFormOutputCoreService;
+    @Autowired
+    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
 
     private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
-
 
     //    /**
 //     * @Description 鏂板鍑哄簱鍗�
@@ -142,12 +150,13 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/27
      */
-    public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+    public int add(LWhFormOutputInsertParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
         //1.鏂板鍑哄簱鍗曡褰�
         LWhFormOutput lWhFormOutput = new LWhFormOutput();
         //鍑哄叆搴搃d
         long lWhFormOutputId = IdUtil.generateId();
         lWhFormOutput.setId(lWhFormOutputId);
+        lWhFormOutput.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
         Long warehouseId = param.getWarehouseId();
         lWhFormOutput.setWarehouseId(warehouseId);
         //鏍规嵁浠撳簱id鏌ヨ浠撳簱
@@ -163,45 +172,48 @@
         lWhFormOutput.setAgencyName(sysInfo.getTenantName());
         lWhFormOutput.setOperatorId(sysInfo.getId());
         lWhFormOutput.setOperatorName(sysInfo.getUserName());
-        long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
-        lWhFormOutput.setDealTime(dateTimeNumber);
+        lWhFormOutput.setDealTime(param.getDealTime());
         lWhFormOutput.setStates(1);
+        lWhFormOutput.setOutputDoc(param.getProcureDoc());
         int flag1 = this.insert(lWhFormOutput);
-
-        //4.鏂板l_wh_goods_record璁板綍
-        List<LWhGoodsRecord> recordList = param.getList();
-        if (CollectionUtils.isEmpty(recordList)) {
-            log.error("瑙勬牸鍨嬪彿涓虹┖");
+        if (flag1 == 0) {
+            log.error("鏂板鍑哄簱鍗曡褰�");
             return 0;
         }
-        int flag5 = 0;
-        for (LWhGoodsRecord record : recordList) {
-            //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
-            int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
-
-            //5.鏂板L_WH_PROCURE_MODEL璁板綍
-            LWhProcureModel lWhProcureModel = new LWhProcureModel();
-            lWhProcureModel.setId(IdUtil.generateId());
-            lWhProcureModel.setBusinessType(3);
-            lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
-            lWhProcureModel.setCounts(record.getThisCount());
-            lWhProcureModel.setWorehouseCount(goodsNum);
-            int res = this.lWhProcureModelService.insert(lWhProcureModel);
-            flag5 += res;
+        //2.鏂板鐗╁搧鍨嬪彿璁板綍
+        List<LWFormsOutputGoodsParam> goodsList = param.getGoods();
+        List<LWhProcureModel> modelList = new ArrayList<>();
+        for (LWFormsOutputGoodsParam goods : goodsList) {
+            List<LWFormsOutputGoodsModelParam> models = goods.getModels();
+            for (LWFormsOutputGoodsModelParam model : models) {
+                LWhProcureModel lWhProcureModel = new LWhProcureModel();
+                lWhProcureModel.setId(IdUtil.generateId());
+                lWhProcureModel.setBusinessType(3);
+                lWhProcureModel.setBusinessId(lWhFormOutputId);
+                lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+                //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+                BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
+                if (baseGoodsModels != null) {
+                    lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+                }
+                lWhProcureModel.setCounts(model.getCounts());
+                //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+                int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+                lWhProcureModel.setWorehouseCount(goodsNum);
+                modelList.add(lWhProcureModel);
+            }
+        }
+        int flag2 = this.lWhProcureModelService.insert(modelList);
+        if (flag2 != modelList.size()) {
+            log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return 0;
         }
 
-        //2.鏍规嵁鍑哄簱鍗曞嚭搴�
-        Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
-        //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
-        int flag3 = 0;
-        if (flag1 > 0) {
-            LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
-            lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
-            flag3 = this.update(lWhFormOutput1);
-        }
-
-        //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
-        if (flag1 == 0 || flag3 == 0 || flag5 != recordList.size()) {
+        //3.鏍规嵁鍑哄簱鍗曞嚭搴�
+        Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, param.getDealTime());
+        if (lWarehouseFlowId == null) {
+            log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return 0;
         }
@@ -210,32 +222,33 @@
     }
 
     /**
-     * @Description  鍒楄〃鏌ヨ
+     * @Description 鍒楄〃鏌ヨ
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
      */
-    public GenericPager queryFormOutputList(LWhFormOutputParam param) {
+    public GenericPager queryFormOutputList(LWhFormOutputQry param) {
         HashMap<String, Object> paramts = new HashMap<>();
         StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST);
         //鍑哄簱鍗曞彿
         if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
-            sql.append(" and BUSINESS_FORM_CODE like :businessFormCode ");
+            sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
             paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
         }
         //鐗╁搧鍚嶇О
         if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
-            sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+            sql.append(
+                " AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
             paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
         }
         //鏈烘瀯
-        if (param.getAgencyId() != null){
+        if (param.getAgencyId() != null) {
             sql.append(" and AGENCY_ID like :agencyId ");
-            paramts.put("agencyId",  param.getAgencyId() + StringUtils.CHAR_PERCENT);
+            paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
         }
         //鍒涘缓浜�
-        if (!StringUtils.isEmpty(param.getOperatorName())) {
+        if (!StringUtils.isEmpty(param.getCreateName())) {
             sql.append(" and operator_name =:operator_name ");
-            paramts.put("operator_name", param.getOperatorName());
+            paramts.put("operator_name", param.getCreateName());
         }
         //鐘舵��
         if (param.getStates() != null) {
@@ -243,13 +256,13 @@
             paramts.put("states", param.getStates());
         }
         //鍑哄簱鏃堕棿
-        if (param.getOutputTimeStart() != null) {
+        if (param.getStartTime() != null) {
             sql.append(" and DEAL_TIME >=:outputTimeStart ");
-            paramts.put("outputTimeStart", param.getOutputTimeStart() * 1000000);
+            paramts.put("outputTimeStart", param.getStartTime() * 1000000);
         }
-        if (param.getOutputTimeEnd() != null) {
+        if (param.getEndTime() != null) {
             sql.append(" and DEAL_TIME <:outputTimeEnd ");
-            paramts.put("outputTimeEnd", param.getOutputTimeEnd() * 1000000 + 240000);
+            paramts.put("outputTimeEnd", param.getEndTime() * 1000000 + 240000);
         }
 
         sql.append(" ORDER BY DEAL_TIME DESC");

--
Gitblit v1.9.1