From abc5baf903a2bd229fb7f2decd35b26536d86e13 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 29 十一月 2023 15:07:57 +0800
Subject: [PATCH] 部门分发增加出库和入库

---
 consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java |   87 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index f9b7993..ca86152 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -16,6 +16,7 @@
 import com.consum.base.pojo.response.LWHFromTransferExtendVO;
 import com.consum.model.po.BaseGoodsModels;
 import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.BaseWarehouseManager;
 import com.consum.model.po.FinSysTenant;
 import com.consum.model.po.FinSysTenantUser;
 import com.consum.model.po.LWhFormOutput;
@@ -35,6 +36,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +74,8 @@
     private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
     @Autowired
     private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
+    @Autowired
+    private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
 
     private static String QUERY_FORM_TRANSFER_LIST = "SELECT ft.* FROM l_wh_form_transfer ft "
         + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
@@ -84,7 +88,7 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
      */
-    public int add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
+    public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
         //1.鏂板璋冩嫧鍗曡褰�
         LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
         //璋冩嫧鍗昳d
@@ -95,8 +99,16 @@
         // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
         // TODO 鏋氫妇瀛楀吀
         lWhFormTransfer.setBusinessType(businessType);
+        CodeGeneratorEnum codeGeneratorEnum = null;
+        if (businessType == 0) {
+            codeGeneratorEnum = CodeGeneratorEnum.Transfer;
+        } else if (businessType == 1) {
+            codeGeneratorEnum = CodeGeneratorEnum.Distribute;
+        } else if (businessType == 2) {
+            codeGeneratorEnum = CodeGeneratorEnum.GOBACK;
+        }
 
-        lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Transfer));
+        lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
 
         Long warehouseId = param.getInWarehouseId();
         // 璋冩嫧绫诲瀷鍗曟嵁
@@ -117,18 +129,46 @@
         //褰撲笟鍔$被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
         if (businessType == 1) {
             //閮ㄩ棬鍒嗗彂绫诲瀷 鍑哄簱浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
-            // TODO 鍑哄簱涓氬姟绫诲瀷 鑱旂郴鐢佃瘽
-            lWhFormTransfer.setOutWarehouseType(1);
-            //lWhFormTransfer.setOutOperatorId();
-            lWhFormTransfer.setOutOperatorName(param.getOperatorName());
-            lWhFormTransfer.setOutputTime(param.getCreateTime());
+            //浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
+
+            //鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
+            Long id = sysInfo.getId();
+            BaseWarehouseManager manager = new BaseWarehouseManager();
+            manager.setManagerId(id);
+            List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
+            if (CollectionUtils.isEmpty(managerList)) {
+                log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
+                throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
+            }
+            Optional<BaseWarehouseManager> first = managerList.stream().findFirst();
+            if (first.isPresent()) {
+                BaseWarehouseManager baseWarehouseManager = first.get();
+                Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId();
+                BaseWarehouse baseWarehouse = new BaseWarehouse();
+                baseWarehouse.setId(baseWarehouseId);
+                BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
+
+                lWhFormTransfer.setInWarehouseType(1);
+                lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
+                lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
+                lWhFormTransfer.setInOperatorName(param.getOperatorName());
+                lWhFormTransfer.setInTime(param.getCreateTime());
+
+                lWhFormTransfer.setOutWarehouseType(0);
+                lWhFormTransfer.setOutWarehouseId(warehouse.getId());
+                lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
+
+                lWhFormTransfer.setOutOperatorId(sysInfo.getId());
+                lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
+                lWhFormTransfer.setOutputTime(param.getCreateTime());
+                lWhFormTransfer.setTel(param.getTel());
+            }
         }
 
         //鏍规嵁鏈烘瀯id鏌ヨ璋冩嫧鏈烘瀯
         FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(param.getOutAgencyId()));
         if (finSysTenant == null) {
             log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
-            return 0;
         }
         lWhFormTransfer.setOutAgencyId(finSysTenant.getId());
         lWhFormTransfer.setOutAgencyName(finSysTenant.getName());
@@ -142,7 +182,6 @@
         int flag1 = this.insert(lWhFormTransfer);
         if (flag1 == 0) {
             log.error("鏂板璋冩嫧鍗曞け璐�");
-            return 0;
         }
 
         //2.鏂板鐗╁搧鍨嬪彿璁板綍
@@ -200,7 +239,6 @@
                     if (procureInsertNum != procureModelUserList.size()) {
                         log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return 0;
                     }
 
                 }
@@ -213,10 +251,8 @@
         if (flag2 != modelList.size()) {
             log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return 0;
         }
-
-        return 1;
+        return lWhFormTransferId;
     }
 
 
@@ -254,7 +290,7 @@
         }
         //鐘舵��
         if (param.getStates() != null) {
-            sql.append(" and states =:states ");
+            sql.append(" and ft.states =:states ");
             paramts.put("states", param.getStates());
         }
         //鍒涘缓浜�
@@ -280,6 +316,11 @@
             sql.append(" and IN_TIME <:inTimeEnd ");
             paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000);
         }
+        //鍒嗗彂閮ㄩ棬
+        if (param.getInWarehouseId() != null) {
+            sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
+            paramts.put("inWarehouseId", param.getInWarehouseId());
+        }
 
         sql.append(" ORDER BY ft.CREATE_TIME DESC");
         GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormTransfer());
@@ -298,6 +339,7 @@
         LWhFormTransfer lWhFormTransfer = this.get(new LWhFormTransfer(id));
         if (lWhFormTransfer != null) {
             BeanUtils.copyProperties(lWhFormTransfer, result);
+            result.setDepartmentName(lWhFormTransfer.getInWarehouseName());
         }
 
         String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME,bgt.CLASSIFICATION type "
@@ -306,6 +348,9 @@
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("id", result.getId());
         List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
+
+        String queryRecord = "SELECT * FROM l_wh_procure_model_user_record where TRANS_BUSINESS_ID = :id order by DEAL_TIME desc limit 1";
+        LWhProcureModelUserRecord lWhProcureModelUserRecord = lWhProcureModelUserRecordService.get(queryRecord, paramMap, new LWhProcureModelUserRecord());
         List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
         for (Map<String, Object> map : procureModelList) {
             FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
@@ -325,6 +370,7 @@
                     Long procureModelId = goodsModelVO.getId();
                     LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
                     lWhProcureModelUser.setWhProcureModelId(procureModelId);
+                    lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
                     List<LWhProcureModelUser> procureModelUserList = this.lWhProcureModelUserService.select(lWhProcureModelUser);
                     if (!CollectionUtils.isEmpty(procureModelUserList)) {
                         List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
@@ -340,8 +386,6 @@
                         });
                         goodsModelVO.setUseInfo(departGoodsUseInfoList);
                     }
-                    // TODO 閮ㄩ棬鍚嶇О
-//                result.setDepartmentName();
 
                 }
                 goodsModelVOList.add(goodsModelVO);
@@ -410,9 +454,10 @@
         HashMap<String, Object> paramts = new HashMap<>();
         StringBuilder sql = new StringBuilder(
             "SELECT ft.id,ft.BUSINESS_FORM_CODE,bgt.GOODS_NAME,bgt.CLASSIFICATION type,bgm.id goodsModelId,bgm.MODEL_NAME goodsModelName,pm.COUNTS goodsCount,fst.`name` tenantName,"
-                + "fstd.NAME departmentName,ft.OPERATOR_ID,ft.CREATE_TIME FROM l_wh_form_transfer ft "
+                + "ft.IN_WAREHOUSE_NAME departmentName,ft.OPERATOR_ID,ft.CREATE_TIME,ft.OPERATOR_NAME FROM l_wh_form_transfer ft "
                 + "inner JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID " + "inner JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
-                + "inner JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "inner JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID "
+                + "inner JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+                + "inner JOIN fin_sys_tenant_user fstu ON fstu.id = ft.OPERATOR_ID "
                 + "inner JOIN fin_sys_tenant_department fstd ON fstu.SYS_DEPT_ID = fstd.ID "
                 + "inner JOIN fin_sys_tenant fst ON fst.id = fstd.TENANT_ID where ft.BUSINESS_TYPE =1 ");
         //鍗曞彿
@@ -435,7 +480,11 @@
             sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID ");
             paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId());
         }
-
+        //鍒嗗彂閮ㄩ棬
+        if (transferQry.getInWarehouseId() != null) {
+            sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId ");
+            paramts.put("inWarehouseId", transferQry.getInWarehouseId());
+        }
         //鍒涘缓浜�
         if (StringUtils.isNotEmpty(transferQry.getOperatorName())) {
             sql.append("AND ft.OPERATOR_NAME =:OPERATOR_NAME ");

--
Gitblit v1.9.1