From fb036b3ca33d483afbf83eede9fd806a2f77deaa Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 06 十二月 2023 13:06:41 +0800
Subject: [PATCH] 代码优化、漏洞修复

---
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java    |  116 ++++----------
 consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java              |    3 
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java |    1 
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java |   11 +
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java       |   62 ++++---
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java    |    9 
 consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java                      |  128 ---------------
 consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java               |    6 
 /dev/null                                                                               |   23 --
 consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java                |   23 ++
 consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java               |    9 +
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java  |    1 
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java    |    1 
 consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java  |   20 ++
 consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java                     |   31 +++
 consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java           |    9 +
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java      |    2 
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java   |    5 
 consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java          |   11 
 19 files changed, 199 insertions(+), 272 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index ef81301..868cd29 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -25,7 +25,6 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelDataConvertException;
@@ -34,6 +33,7 @@
 import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.pojo.FinSysTenantUserSearchParam;
 import com.consum.base.pojo.FinSysTenantUserUpdParam;
+import com.consum.base.pojo.ImportUserParam;
 import com.consum.base.pojo.response.DepartmentVO;
 import com.consum.base.pojo.response.FinSysTenantUserVO;
 import com.consum.base.pojo.response.FinSysTenantVO;
@@ -298,80 +298,6 @@
         return ResponseValue.success(1);
     }
 
-    public static class ImportUserParam {
-
-        @ExcelProperty("鐢ㄦ埛濮撳悕")
-        private String userName;
-        @ExcelProperty("鐢ㄦ埛缂栧彿")
-        private String userCode;
-        @ExcelProperty("鎵嬫満鍙�")
-        private String userPhone;
-        @ExcelProperty("鎬у埆(1鐢凤紝2濂�)")
-        private Integer sex;
-        @ExcelProperty("鐢靛瓙閭")
-        private String email;
-        @ExcelProperty("椤哄簭鍙�")
-        private Long seq;
-        @ExcelProperty("瑙掕壊鍚嶇О")
-        private String roleName;
-
-        public String getUserName() {
-            return userName;
-        }
-
-        public void setUserName(String userName) {
-            this.userName = userName;
-        }
-
-        public String getUserCode() {
-            return userCode;
-        }
-
-        public void setUserCode(String userCode) {
-            this.userCode = userCode;
-        }
-
-        public String getUserPhone() {
-            return userPhone;
-        }
-
-        public void setUserPhone(String userPhone) {
-            this.userPhone = userPhone;
-        }
-
-        public Integer getSex() {
-            return sex;
-        }
-
-        public void setSex(Integer sex) {
-            this.sex = sex;
-        }
-
-        public String getEmail() {
-            return email;
-        }
-
-        public void setEmail(String email) {
-            this.email = email;
-        }
-
-        public Long getSeq() {
-            return seq;
-        }
-
-        public void setSeq(Long seq) {
-            this.seq = seq;
-        }
-
-        public String getRoleName() {
-            return roleName;
-        }
-
-        public void setRoleName(String roleName) {
-            this.roleName = roleName;
-        }
-    }
-
     /**
      * @Description 鎵归噺瀵煎叆鐢ㄦ埛
      * @Author jlq
@@ -557,7 +483,12 @@
      */
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseValue update(@RequestBody FinSysTenantUser user) {
+    public ResponseValue update() {
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, formInventoryParam);
+        user = formInventoryParam;
+
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
@@ -611,7 +542,11 @@
      */
     @PostMapping("/updateStatus")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseValue updateStatus(@RequestBody FinSysTenantUser user) {
+    public ResponseValue updateStatus() {
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser formInventoryParam = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, formInventoryParam);
+        user = formInventoryParam;
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
@@ -739,11 +674,15 @@
     /**
      * 鏇存柊瑙掕壊鏉冮檺
      *
-     * @param user
      * @return
      */
     @PostMapping("/updRole")
-    public ResponseValue updRole(@RequestBody FinSysTenantUser user) {
+    public ResponseValue updRole() {
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, finSysTenantParam);
+        user = finSysTenantParam;
+
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
@@ -767,7 +706,11 @@
      */
     @PostMapping("/addSupplier")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseValue addSupplier(@RequestBody FinSysTenantUser user) {
+    public ResponseValue addSupplier() {
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, finSysTenantParam);
+        user = finSysTenantParam;
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
@@ -879,7 +822,11 @@
 
     @PostMapping("/updatePerson")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseValue updatePerson(@RequestBody FinSysTenantUser user) {
+    public ResponseValue updatePerson() {
+        FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+        FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
+        CommonUtil.copyProperties(user, finSysTenantParam);
+        user = finSysTenantParam;
         if (user == null) {
             return ResponseValue.error("鍙傛暟涓虹┖");
         }
@@ -924,7 +871,12 @@
      * @Description 淇敼瀵嗙爜
      */
     @PostMapping("/updatePassword")
-    public ResponseValue updatePassword(@RequestBody FinSysTenantUserUpdParam param) {
+    public ResponseValue updatePassword() {
+        FinSysTenantUserUpdParam param = CommonUtil.getObjFromReqBody(FinSysTenantUserUpdParam.class);
+        FinSysTenantUserUpdParam finSysTenantParam = new FinSysTenantUserUpdParam();
+        CommonUtil.copyProperties(param, finSysTenantParam);
+        param = finSysTenantParam;
+
         String oldMixPd = param.getOldMixPd();
         String newMixPd = param.getNewMixPd();
         String btnMixPd = param.getBtnMixPd();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 1de90ad..8465516 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -5,7 +5,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -23,10 +25,9 @@
 
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.core.utils.MapUtils;
-import com.consum.base.core.utils.MapperUtil;
 import com.consum.base.core.utils.PageUtil;
 import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
 import com.consum.base.pojo.excel.OutputExcelTemplate;
 import com.consum.base.pojo.query.LWhFormOutputQry;
 import com.consum.base.pojo.response.FormOutputGoodsVO;
@@ -154,35 +155,48 @@
         BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
         lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());
 
-        String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
-            + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
-            + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
-            + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("id", lWhFormOutputExtendVO.getId());
-        List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
+        List<GoodModelInfoDTO> goodsModelList =
+            lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId());
+        if (CollectionUtils.isEmpty(goodsModelList)) {
+            return ResponseValue.success(lWhFormOutputExtendVO);
+        }
+        Map<Long, List<GoodModelInfoDTO>> collect =
+            goodsModelList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
         List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
-        for (Map<String, Object> map : procureModelList) {
-            FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class);
-
-            // 鏌ヨ鍨嬪彿鏁伴噺
-            List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
-            String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
-                + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
-                + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id";
-            List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
-            modelList.forEach(item -> {
-                GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
-                goodsModelVOList.add(goodsModelVO);
-            });
-            procureTemplateInfoVO.setModels(goodsModelVOList);
-            fromOutputGoods.add(procureTemplateInfoVO);
+        for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) {
+            FormOutputGoodsVO formOutputGoodsVO = getFormOutputGoodsVO(entry);
+            fromOutputGoods.add(formOutputGoodsVO);
         }
         lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
 
         return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
     }
 
+    private static FormOutputGoodsVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) {
+        Long baseGoodsTemplateId = entry.getKey();
+        List<GoodModelInfoDTO> goodModelInfoDTOS = entry.getValue();
+        GoodModelInfoDTO goodModelInfoDTO = goodModelInfoDTOS.stream().findFirst().orElse(null);
+        FormOutputGoodsVO formOutputGoodsVO = new FormOutputGoodsVO();
+        if (goodModelInfoDTO != null) {
+            formOutputGoodsVO.setId(baseGoodsTemplateId);
+            formOutputGoodsVO.setCategoryId(goodModelInfoDTO.getCategoryId());
+            formOutputGoodsVO.setCategoryName(goodModelInfoDTO.getCategoryName());
+            formOutputGoodsVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName());
+        }
+        List<GoodsModelVO> goodsModelList = Lists.newArrayList();
+        for (GoodModelInfoDTO goodModelInfo : goodModelInfoDTOS) {
+            GoodsModelVO goodsModelVO = new GoodsModelVO();
+            goodsModelVO.setId(goodModelInfo.getId());
+            goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
+            goodsModelVO.setUnit(goodModelInfo.getUnit());
+            goodsModelVO.setCounts(goodModelInfo.getCounts());
+            goodsModelVO.setTotalAmount(goodModelInfo.getTotalAmount());
+            goodsModelList.add(goodsModelVO);
+        }
+        formOutputGoodsVO.setModels(goodsModelList);
+        return formOutputGoodsVO;
+    }
+
     @ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
     @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry",
         paramType = "query")
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index f5a6218..a6e626a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -34,7 +34,7 @@
 import com.consum.base.pojo.response.LWhFormProcureExtendVO;
 import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
 import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.LWhFormProcureCoreService;
+import com.consum.base.service.impl.LWhFormProcureCoreService;
 import com.consum.base.service.LWhFormProcureGoodsService;
 import com.consum.base.service.LWhFormProcureService;
 import com.consum.base.service.LWhProcureModelService;
diff --git a/consum-base/src/main/java/com/consum/base/core/AgencyEntity.java b/consum-base/src/main/java/com/consum/base/core/AgencyEntity.java
deleted file mode 100644
index ac9195d..0000000
--- a/consum-base/src/main/java/com/consum/base/core/AgencyEntity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.consum.base.core;
-
-import com.consum.base.core.po.SYS_AGENCY;
-
-public class AgencyEntity {
-
-    private long agency_id;
-
-    //褰撳墠ID浠ｈ〃鐨凷YS_AGENCY
-    private SYS_AGENCY angency;
-
-    //绗竴灞傜骇鐨凷YS_AGENCY锛屽嵆鐪佺骇鏈烘瀯
-    private SYS_AGENCY firstAgency;
-
-    //绗簩灞傜骇SYS_AGENCY锛屽嵆甯傜骇鏈烘瀯
-    private SYS_AGENCY secondAgency;
-
-    //绗笁灞傜骇SYS_AGENCY锛屽嵆鍘跨骇鏈烘瀯
-    private SYS_AGENCY thirdAgency;
-
-    //绗洓灞傜骇SYS_AGENCY锛屽嵆鏀眬銆佺綉鐐规満鏋�
-    private SYS_AGENCY fourthAgency;
-
-    public SYS_AGENCY getAngency() {
-        return angency;
-    }
-
-    public void setAngency(SYS_AGENCY angency) {
-        this.angency = angency;
-    }
-
-    public SYS_AGENCY getFirstAgency() {
-        return firstAgency;
-    }
-
-    public void setFirstAgency(SYS_AGENCY firstAgency) {
-        this.firstAgency = firstAgency;
-    }
-
-    public SYS_AGENCY getSecondAgency() {
-        return secondAgency;
-    }
-
-    public void setSecondAgency(SYS_AGENCY secondAgency) {
-        this.secondAgency = secondAgency;
-    }
-
-    public SYS_AGENCY getThirdAgency() {
-        return thirdAgency;
-    }
-
-    public void setThirdAgency(SYS_AGENCY thirdAgency) {
-        this.thirdAgency = thirdAgency;
-
-    }
-
-    public SYS_AGENCY getFourthAgency() {
-        return fourthAgency;
-    }
-
-    public void setFourthAgency(SYS_AGENCY fourthAgency) {
-        this.fourthAgency = fourthAgency;
-    }
-
-
-    public AgencyEntity(long agency_id){
-        this.agency_id = agency_id;
-    }
-
-
-
-
-    public long getAgency_id() {
-        return agency_id;
-    }
-
-    public void setAgency_id(long agency_id) {
-        this.agency_id = agency_id;
-    }
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/AgencyService.java b/consum-base/src/main/java/com/consum/base/core/AgencyService.java
deleted file mode 100644
index ba6fb93..0000000
--- a/consum-base/src/main/java/com/consum/base/core/AgencyService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.consum.base.core;
-
-
-import com.consum.base.core.po.SYS_AGENCY;
-
-/**
- * 缁勭粐鏈烘瀯绫婚�氱敤service
- */
-public class AgencyService {
-
-
-    public static void main(String[] args) {
-
-    }
-
-    /**
-     * 鏍规嵁缁勭粐鏈烘瀯ID锛岃幏鍙栫粍缁囨満鏋勬爲
-     * @param agency_id
-     * @return
-     */
-    public AgencyEntity getAgencyTreeEntityById(long agency_id){
-
-        AgencyEntity entity = new AgencyEntity(agency_id);
-        entity.setAngency(new SYS_AGENCY());
-        entity.setFirstAgency(new SYS_AGENCY());
-        entity.setSecondAgency(new SYS_AGENCY());
-        entity.setThirdAgency(new SYS_AGENCY());
-        entity.setFourthAgency(new SYS_AGENCY());
-        return entity;
-    }
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeTemplateService.java b/consum-base/src/main/java/com/consum/base/core/CodeTemplateService.java
deleted file mode 100644
index e8da0ff..0000000
--- a/consum-base/src/main/java/com/consum/base/core/CodeTemplateService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.consum.base.core;
-
-
-import java.util.List;
-import java.util.Map;
-
-public class CodeTemplateService {
-
-    /**
-     * 鏍规嵁鍒嗙被缂栧彿鍜屾湰绾ф満鏋勭紪鍙凤紝鑾峰彇鍙煡鐪嬬墿鍝佹ā鐗堝垪琛�
-     * @param third_category_id 鍒嗙被缂栧彿锛屽垎绫荤紪鍙蜂负Null鏃讹紝鏌ヨ鎵�鏈夊垎绫�
-     * @param agencyId 鏈烘瀯缂栧彿
-     * @return 閲囪喘绫诲瀷涓鸿嚜閲囩殑锛屽彧鑳芥湰绾ф満鏋勫唴鍙銆傞泦閲囩殑鏈骇鍙婁笅绾т竴鏉＄嚎鐨勬満鏋勫潎鍙銆�
-     */
-    public List<Map> getTemplateListByAgencyId(String third_category_id,String agencyId){
-
-        return null;
-    }
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/GoodsService.java b/consum-base/src/main/java/com/consum/base/core/GoodsService.java
deleted file mode 100644
index 282e190..0000000
--- a/consum-base/src/main/java/com/consum/base/core/GoodsService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.consum.base.core;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class GoodsService {
-
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/UnifyBusinessService.java b/consum-base/src/main/java/com/consum/base/core/UnifyBusinessService.java
deleted file mode 100644
index 5104c1f..0000000
--- a/consum-base/src/main/java/com/consum/base/core/UnifyBusinessService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.consum.base.core;
-
-
-import com.consum.base.core.po.WhFormProcure;
-import com.consum.model.po.WhFormTransfer;
-import org.springframework.stereotype.Service;
-
-/**
- * 缁熶竴鍑哄叆搴撴帴鍙�
- */
-@Service
-public class UnifyBusinessService {
-
-    /**
-     * 閲囪喘鍏ュ簱
-     * @param procure
-     */
-    public void procure(WhFormProcure procure){
-
-    }
-
-
-    /**
-     * 璋冩嫧鍑哄簱
-     * @param transfer
-     */
-    public void transferOutput(WhFormTransfer transfer){
-
-    }
-
-    /**
-     * 璋冩嫧鍏ュ簱
-     * @param transfer
-     */
-    public void transferInput(WhFormTransfer transfer){
-
-    }
-
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
deleted file mode 100644
index 142719f..0000000
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
+++ /dev/null
@@ -1,853 +0,0 @@
-package com.consum.base.core;
-
-import com.consum.base.core.param.BaseWarehouseParam;
-import com.consum.base.core.param.DepBackWarehouseParam;
-import com.consum.base.core.utils.SqlParameter;
-import com.consum.base.core.utils.SuperMap;
-import com.consum.base.core.utils.DateUtil;
-import com.consum.model.po.*;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 杩涘嚭搴� 涓氬姟澶� 绫�
- */
-@Service
-public class WarehouseBusinessService extends BaseServiceImpl {
-
-
-    @Autowired
-    private WarehouseCoreService coreService;
-
-    /**
-     * 鎵ц閲囪喘鍏ュ簱
-     * 绗竴姝ワ細閫氳繃閲囪喘鍗曘�怶H_FORM_PROCURE銆戞煡璇㈤噰璐崟鍨嬪彿銆怶H_FORM_PROCURE_MODEL銆戞暟鎹�
-     * 绗簩姝ワ細缁勭粐CheckWarehouseParam锛岃皟鐢╓arehouseCoreService.unifyCheck()鎵ц鍏ュ簱
-     * 绗笁姝ワ細鏇存柊閲囪喘鍗曞瀷鍙枫�怶H_FORM_PROCURE_MODEL銆戝簱瀛樼墿鍝佺紪鍙峰瓧娈靛強涓昏〃WH_FORM_PROCURE鐘舵�佷俊鎭�
-     * 绗洓姝ワ細鏇存柊 杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-     * @param procure
-     */
-    public void doProcure(WhFormProcure procure){
-
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_PROCURE_MODEL A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_PROCURE_ID = :PROCURE_ID";
-
-        List<WhFormProcureModel>  modelList = this.select(sql,new SqlParameter().put("PROCURE_ID",procure.getId()),new WhFormProcureModel());
-
-        for (WhFormProcureModel model : modelList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(true);
-            param.setWarehouseId(procure.getId());
-            param.setCount(model.getCounts());
-            param.setFirstInputCode(model.getId().toString());
-            param.setFirst_input_type(1);
-            param.setModelId(model.getBaseGoodsModelsId());
-            CheckWarehouseResult result =  coreService.unifyCheck(param).get(0);
-
-
-            WhGoodsDetails details = new WhGoodsDetails();
-            details.setId(result.getWhGoods().getFirstInputHisId());
-            details.setBusinessFormId(procure.getId());
-            details.setBusinessFormCode(procure.getBusinessFormCode());
-            details.setBusinessFormName(procure.getWarehouseName() + "閲囪喘鍏ュ簱鍗�:" + details.getBusinessFormCode());
-            details.setInitialCount(result.getInitial_count());
-            details.setThisType(1);
-            details.setEndCount(result.getEnd_count());
-            details.setWarehouseId(param.getWarehouseId());
-            details.setWarehouseName(procure.getWarehouseName());
-            details.setClassification(1);
-            details.setOperatorId(procure.getOperatorId2());
-            details.setOperatorName(procure.getOperatorName2());
-            details.setDealTime(procure.getIncomeTime());
-            details.setWhGoodsId(result.getWhGoods().getId());
-
-            this.insert(details);
-
-
-            model.setInWhGoodsDetailsId(details.getId());
-            update(model);
-
-            procure.setStates(2);
-            update(procure);
-        }
-    }
-    public void doOutPut(WhFormOutput output){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_OUTPUT_GOODS A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_OUTPUT_ID = :OUTPUT_ID";
-
-        List<WhFormOutputGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("OUTPUT_ID",output.getId()),new WhFormOutputGoods());
-
-        for (WhFormOutputGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(false);
-            param.setWarehouseId(output.getWarehouseId());
-            param.setModelId(goods.getBaseGoodsModelsId());
-            param.setCount(goods.getCounts());
-
-            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-            for (CheckWarehouseResult result : results){
-                WhFormOutputModel model = new WhFormOutputModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setCounts(result.getInitial_count() - result.getEnd_count());
-                model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
-                model.setWhGoodsId(result.getWhGoods().getId());
-                model.setWhFormOutputId(output.getId());
-                model.setWhFormOutputGoodsId(goods.getId());
-                insert(model);
-
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setBusinessFormId(output.getId());
-                details.setBusinessFormCode(output.getBusinessFormCode());
-                details.setBusinessFormName("鍑哄簱鍗曪細" + output.getBusinessFormCode());
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(2);
-                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-                details.setClassification(3);
-                details.setOperatorId(output.getOperatorId());
-                details.setOperatorName(output.getOperatorName());
-                details.setDealTime(output.getDealTime());
-                details.setWhGoodsId(result.getWhGoods().getId());
-                this.insert(details);
-            }
-        }
-    }
-
-
-    /**
-     * 鎵ц璋冩嫧鍑哄簱鎿嶄綔
-     * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
-     * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
-     * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-     * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负寰呮帴鏀讹紝鏇存柊璋冩嫧鍗曠墿鍝併�怶H_FORM_TRANSFER_MODEL銆戝嚭搴撴祦姘碔D
-     * @param transfer
-     */
-    public void doTransferOutPut(WhFormTransfer transfer){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_TRANSFER_GOODS A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
-
-        List<WhFormTransferGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("TRANSFER_ID",transfer.getId()),new WhFormTransferGoods());
-
-        for (WhFormTransferGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(false);
-            param.setWarehouseId(transfer.getOutWarehouseId());
-            param.setCount(goods.getCounts());
-            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-            for (CheckWarehouseResult result : results){
-                WhFormTransferModel model = new WhFormTransferModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setWhFormTransferId(transfer.getId());
-                model.setWorehouseCount(result.getInitial_count());
-                model.setCounts(result.getInitial_count() - result.getEnd_count());
-                model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
-                model.setWhFormTransferGoodsId(goods.getId());
-                insert(model);
-
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setBusinessFormId(transfer.getId());
-                details.setBusinessFormCode(transfer.getBusinessFormCode());
-                details.setBusinessFormName("璋冩嫧鍑哄簱鍗曪細" + transfer.getBusinessFormCode());
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(2);
-                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-                details.setClassification(5);
-                details.setOperatorId(transfer.getOperatorId());
-                details.setOperatorName(transfer.getOperatorName());
-                details.setDealTime(transfer.getOutputTime());
-                details.setWhGoodsId(result.getWhGoods().getId());
-                this.insert(details);
-            }
-        }
-    }
-
-    /**
-     * 鎵ц璋冩嫧鍏ュ簱鎿嶄綔
-     * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
-     * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
-     * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-     * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负宸插叆搴擄紝锛屾洿鏂拌皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_MODEL銆戝叆搴撴祦姘碔D
-     * @param transfer
-     */
-    public void doTransferInPut(WhFormTransfer transfer){
-
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_TRANSFER_MODEL A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
-
-        List<WhFormTransferModel>  modelsList = this.select(sql,new SqlParameter()
-                                    .put("TRANSFER_ID",transfer.getId()),new WhFormTransferModel());
-
-        for (WhFormTransferModel model : modelsList) {
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(true);
-            param.setWarehouseId(transfer.getInWarehouseId());
-            param.setCount(model.getCounts());
-            param.setWh_goods_id(model.getWhGoodsId());
-            CheckWarehouseResult result = coreService.unifyCheck(param).get(0);
-
-            WhGoodsDetails details = new WhGoodsDetails();
-            details.setBusinessFormId(transfer.getId());
-            details.setBusinessFormCode(transfer.getBusinessFormCode());
-            details.setBusinessFormName("璋冩嫧鍏ュ簱鍗曪細" + transfer.getBusinessFormCode());
-            details.setInitialCount(result.getInitial_count());
-            details.setThisType(1);
-            details.setThisCount(result.getEnd_count()-result.getInitial_count());
-            details.setEndCount(result.getEnd_count());
-            details.setWarehouseId(result.getWhGoods().getWarehouseId());
-            details.setWarehouseName(result.getWhGoods().getWarehouseName());
-            details.setClassification(4);
-            details.setOperatorId(transfer.getOperatorId2());
-            details.setOperatorName(transfer.getOperatorName2());
-            details.setDealTime(transfer.getIninputTime());
-            details.setWhGoodsId(result.getWhGoods().getId());
-            this.insert(details);
-
-            model.setInWhGoodsDetailsId(details.getId());
-            update(model);
-        }
-    }
-
-    /**
-     * 鎶ュ簾鍗�
-     * @param scrapped
-     */
-    public void doScrapped(WhFormScrapped scrapped){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_SCRAPPED_GOODS A \n" +
-                "WHERE\n" +
-                "	A.DEP_FORM_SCRAPPED_ID = :SCRAPPED_ID";
-
-        List<WhFormScrappedGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("SCRAPPED_ID",scrapped.getId()),new WhFormScrappedGoods());
-
-        for (WhFormScrappedGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(false);
-            param.setWarehouseId(scrapped.getWarehouseId());
-            param.setCount(goods.getCounts());
-            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-            for (CheckWarehouseResult result : results){
-
-
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setBusinessFormId(scrapped.getId());
-                details.setBusinessFormCode(scrapped.getBusinessFormCode());
-                details.setBusinessFormName("鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(2);
-                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-                details.setClassification(10);
-                details.setOperatorId(scrapped.getOperatorId());
-                details.setOperatorName(scrapped.getOperatorName());
-                details.setDealTime(scrapped.getDealTime());
-                details.setWhGoodsId(result.getWhGoods().getId());
-                this.insert(details);
-
-
-                WhFormScrappedModel model = new WhFormScrappedModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setCounts(result.getWhGoods().getWhCount());
-                model.setScrappedCode(goods.getScrappedCode());
-                model.setScrappedName(goods.getScrappedName());
-                model.setDepGoodsDetailsId(details.getId());
-                model.setDepFormScrappedId(scrapped.getId());
-                model.setWhGoodsId(result.getWhGoods().getId());
-                model.setWhFormScrappedGoodsId(goods.getId());
-                insert(model);
-            }
-        }
-    }
-
-    /**
-     * 鍒涘缓鐩樼偣浠诲姟锛屽垱寤虹洏鐐逛换鍔℃椂锛屾牴鎹綋鏃舵椂闂翠細灏嗗簱瀛樻暟鎹喕缁撲竴浠芥斁鍏ュ緟鐩樼偣鍗曘��
-     * 1.浠庡簱瀛樼墿鍝併�怶H_GOODS銆戜腑鎸夌収浠撳簱灏嗘暟鎹斁鍏ョ洏鐐瑰崟鐗╁搧銆怶H_FORM_INVENTORY_GOODS銆戯紝涓昏鏄�
-     * 鏈熷垵鏁伴噺INIT_COUNTS锛屽拰 搴撳瓨鐗╁搧缂栧彿WH_GOODS_ID瀛楁
-     * @param inventory
-     */
-    public void createInventoryForm(WhFormInventory inventory){
-        String sql =
-                "SELECT\n" +
-                        "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                        "	b.GOODS_TEMPLATE_NAME,\n" +
-                        "	SUM( b.WH_COUNT ) AS WH_COUNT,\n" +
-                        "	b.BASE_GOODS_MODELS_ID,\n" +
-                        "	b.BASE_GOODS_MODELS_NAME,\n" +
-                        "	b.UNIT \n" +
-                        "FROM\n" +
-                        "	(\n" +
-                        "	SELECT\n" +
-                        "		ID \n" +
-                        "	FROM\n" +
-                        "		BASE_GOODS_MODELS m \n" +
-                        "	WHERE\n" +
-                        "		STATES != 3 \n" +
-                        "		AND EXISTS ( SELECT 1 FROM BASE_GOODS_TEMPLATE t WHERE t.ID = m.GOODS_TEMPLATES_ID AND t.STATES != 3 ) \n" +
-                        "	) a\n" +
-                        "	LEFT JOIN wh_goods b ON a.ID = b.BASE_GOODS_MODELS_ID \n" +
-                        "WHERE\n" +
-                        "	b.STATES = 1 \n" +
-                        "	AND b.WAREHOUSE_ID =:WAREHOUSE_ID \n" +
-                        "GROUP BY\n" +
-                        "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                        "	b.GOODS_TEMPLATE_NAME,\n" +
-                        "	b.BASE_GOODS_MODELS_ID,\n" +
-                        "	b.BASE_GOODS_MODELS_NAME";
-
-        List<WhGoods> goodsList = select(sql,new SqlParameter().add("WAREHOUSE_ID",inventory.getWarehouseId()));
-        List<WhFormInventoryGoods> list = new ArrayList<>();
-        for (WhGoods goods : goodsList) {
-            WhFormInventoryGoods inventoryGoods = new WhFormInventoryGoods();
-            inventoryGoods.setId(NumberGenerator.getLongSequenceNumber());
-            inventoryGoods.setWhFormInventoryId(inventory.getId());
-            inventoryGoods.setBaseGoodsTemplateId(goods.getBaseGoodsTemplateId());
-            inventoryGoods.setGoodsTemplateName(goods.getGoodsTemplateName());
-            inventoryGoods.setUnit(goods.getUnit());
-            inventoryGoods.setBaseGoodsModelsId(goods.getBaseGoodsModelsId());
-            inventoryGoods.setBaseGoodsModelsName(goods.getBaseGoodsModelsName());
-            inventoryGoods.setInitCounts(goods.getWhCount());
-            inventoryGoods.setInitCounts(null);
-            inventoryGoods.setErrorCounts(null);
-            inventoryGoods.setInventoryResult(1);
-            list.add(inventoryGoods);
-        }
-        insertBatch(list);
-
-    }
-
-    /**
-     * 鐩樼偣鍑哄簱
-     * @param inventory
-     */
-    public void doInventoryOutput(WhFormInventory inventory){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_INVENTORY_GOODS A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
-                "  AND A.INVENTORY_RESULT =3 ";
-
-        List<WhFormInventoryGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
-
-        for (WhFormInventoryGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(false);
-            param.setWarehouseId(inventory.getWarehouseId());
-            param.setCount(goods.getErrorCounts());
-            param.setModelId(goods.getBaseGoodsModelsId());
-            param.setOutput_type(3);
-            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-            for (CheckWarehouseResult result : results){
-
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setBusinessFormId(inventory.getId());
-                details.setBusinessFormCode(inventory.getBusinessFormCode());
-                details.setBusinessFormName("鐩樼偣鍑哄崟锛�" + inventory.getBusinessFormCode());
-
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(2);
-                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-                details.setClassification(9);
-                details.setOperatorId(inventory.getOperatorId());
-                details.setOperatorName(inventory.getOperatorName());
-                details.setDealTime(inventory.getStopTime());
-                details.setWhGoodsId(result.getWhGoods().getId());
-                this.insert(details);
-
-
-                WhFormInventoryModel model = new WhFormInventoryModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setCounts(result.getWhGoods().getWhCount());
-                model.setWhFormInventoryId(inventory.getId());
-                model.setInventoryResult(3);
-                model.setWhGoodsDetailsId(details.getId());
-                model.setWhFormInventoryGoodsId(goods.getId());
-                model.setWhGoodsId(result.getWhGoods().getId());
-                insert(model);
-            }
-        }
-    }
-
-    /**
-     * 鐩樼偣鍏ュ簱
-     * @param inventory
-     */
-    public void doInventoryInput(WhFormInventory inventory){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_FORM_INVENTORY_GOODS A \n" +
-                "WHERE\n" +
-                "	A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
-                "  AND A.INVENTORY_RESULT =2 ";
-
-        List<WhFormInventoryGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
-
-        for (WhFormInventoryGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(true);
-            param.setWarehouseId(inventory.getWarehouseId());
-            param.setCount(goods.getErrorCounts());
-            param.setModelId(goods.getBaseGoodsModelsId());
-            param.setFirst_input_type(3);
-            CheckWarehouseResult result =  coreService.unifyCheck(param).get(0);
-
-            WhGoodsDetails details = new WhGoodsDetails();
-            details.setBusinessFormId(inventory.getId());
-            details.setBusinessFormCode(inventory.getBusinessFormCode());
-            details.setBusinessFormName("鐩樼偣鍏ュ簱鍗曪細" + inventory.getBusinessFormCode());
-
-            details.setInitialCount(result.getInitial_count());
-            details.setThisType(1);
-            details.setThisCount(result.getEnd_count()-result.getInitial_count());
-            details.setEndCount(result.getEnd_count());
-            details.setWarehouseId(result.getWhGoods().getWarehouseId());
-            details.setWarehouseName(result.getWhGoods().getWarehouseName());
-            details.setClassification(8);
-            details.setOperatorId(inventory.getOperatorId());
-            details.setOperatorName(inventory.getOperatorName());
-            details.setDealTime(inventory.getStopTime());
-            details.setWhGoodsId(result.getWhGoods().getId());
-            this.insert(details);
-
-
-            WhFormInventoryModel model = new WhFormInventoryModel();
-            model.setId(NumberGenerator.getLongSequenceNumber());
-            model.setCounts(result.getWhGoods().getWhCount());
-            model.setWhFormInventoryId(inventory.getId());
-            model.setInventoryResult(3);
-            model.setWhGoodsDetailsId(details.getId());
-            model.setWhFormInventoryGoodsId(goods.getId());
-            model.setWhGoodsId(result.getWhGoods().getId());
-            insert(model);
-        }
-    }
-
-    /**
-     * 缁熶竴澶勭悊搴撳瓨棰勮锛堝畾鏃朵换鍔¤皟鐢ㄦ湇鍔★級
-     * 璁″垝锛氭瘡澶╀腑鍗�13锛�00銆佹櫄涓�1:00鎵ц涓ゆ
-     */
-    public void insertWarning(){
-
-        String sql = "SELECT\n" +
-                "	SUM(b.WH_COUNT) AS WH_COUNT,\n" +
-                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                "	b.GOODS_TEMPLATE_NAME,\n" +
-                "   b.WAREHOUSE_ID,\n" +
-                "	a.UPPER_LIMIT,\n" +
-                "	a.LOWER_LIMIT \n" +
-                "FROM\n" +
-                "	WH_WARNING_CONFIG a\n" +
-                "	LEFT JOIN wh_goods b ON a.BASE_GOODS_TEMPLATE_ID = b.BASE_GOODS_TEMPLATE_ID \n" +
-                "WHERE\n" +
-                "	a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
-                "	AND b.STATES = 1 \n" +
-                "	AND a.GOODS_TYPE=1\n" +
-                " 	AND  ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
-                "GROUP BY\n" +
-                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                "	b.GOODS_TEMPLATE_NAME,\n" +
-                "   b.WAREHOUSE_ID,\n" +
-                "	a.UPPER_LIMIT,\n" +
-                "	a.LOWER_LIMIT";
-
-        List<Map> goodslist = select(sql,new SqlParameter());
-
-        sql = "SELECT\n" +
-                "	SUM(b.WH_COUNT) AS WH_COUNT,\n" +
-                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                "	b.GOODS_TEMPLATE_NAME,\n" +
-                "	b.BASE_GOODS_MODELS_ID,\n" +
-                "	b.BASE_GOODS_MODELS_NAME,\n" +
-                "   b.WAREHOUSE_ID,\n" +
-                "	a.UPPER_LIMIT,\n" +
-                "	a.LOWER_LIMIT \n" +
-                "FROM\n" +
-                "	WH_WARNING_CONFIG a\n" +
-                "	LEFT JOIN wh_goods b ON a.BASE_GOODS_MODELS_ID = b.BASE_GOODS_MODELS_ID \n" +
-                "WHERE\n" +
-                "	a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
-                "	AND b.STATES = 1 \n" +
-                "	AND a.GOODS_TYPE=2\n" +
-                " 	AND  ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
-                "GROUP BY\n" +
-                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-                "	b.GOODS_TEMPLATE_NAME,\n" +
-                "	b.BASE_GOODS_MODELS_ID,\n" +
-                "	b.BASE_GOODS_MODELS_NAME,\n" +
-                "   b.WAREHOUSE_ID,\n" +
-                "	a.UPPER_LIMIT,\n" +
-                "	a.LOWER_LIMIT";
-
-        List<Map> modeslist = select(sql,new SqlParameter());
-
-        List<Map> list = new ArrayList<>();
-        list.addAll(goodslist);
-        list.addAll(modeslist);
-
-        List<WhWarning> warningList = new ArrayList<>();
-        for (Map map : list) {
-            SuperMap superMap = new SuperMap(map);
-            BaseWarehouse warehouse = get(new BaseWarehouse(),"ID=?",new Object[]{superMap.get("WAREHOUSE_ID")});
-
-            WhWarning warning = new WhWarning();
-            warning.setId(NumberGenerator.getLongSequenceNumber());
-            warning.setBaseWarehouseId(warehouse.getId());
-            warning.setBaseWarehouseName(warehouse.getWarehouseName());
-            warning.setBaseGoodsTemplateId(superMap.getLong("BASE_GOODS_TEMPLATE_ID"));
-            warning.setBaseGoodsTemplateName(superMap.getString("GOODS_TEMPLATE_NAME"));
-            if (superMap.getString("BASE_GOODS_MODELS_ID") == null){
-                warning.setGoodsType(1);
-            } else {
-                warning.setBaseGoodsModelsId(superMap.getLong("BASE_GOODS_MODELS_ID"));
-                warning.setBaseGoodsModelsName(superMap.getString("BASE_GOODS_MODELS_NAME"));
-                warning.setGoodsType(2);
-            }
-
-            int whCount = superMap.getInteger("WH_COUNT");
-            int upCount = superMap.getInteger("UPPER_LIMIT");
-            int lowCount = superMap.getInteger("LOWER_LIMIT");
-
-            if (whCount >= upCount){
-                warning.setWarningType(1);
-            }
-            if (whCount<=lowCount){
-                warning.setWarningType(2);
-            }
-
-            warning.setUpperLimit(upCount);
-            warning.setLowerLimit(lowCount);
-            warning.setWarehouseCount(whCount);
-            warning.setStates(1);
-            warning.setWarningTime(DateUtil.getCurrentDateFor14());
-            warning.setAgencyId(warehouse.getAgencyId());
-            warning.setAgencyName(warehouse.getAgencyName());
-
-            warningList.add(warning);
-        }
-
-        insertBatch(warningList);
-    }
-
-    public void doDepBack(String depFormBackId){
-
-        DepFormBack back = get(new DepFormBack(),"ID=?",new Object[]{depFormBackId});
-
-        String sql = "SELECT\n" +
-                "	B.*,\n" +
-                "	A.BACK_COUNTS, \n" +
-                "	A.ID AS DEP_FORM_BACK_GOODS_ID \n" +
-                "FROM\n" +
-                "	DEP_FORM_BACK_GOODS A\n" +
-                "	LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
-                "WHERE\n" +
-                "	A.DEP_FORM_BACK_ID = :DEP_FORM_BACK_ID \n" +
-                "	AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
-                "	AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
-
-        List<Map> list = select(sql,new SqlParameter("DEP_FORM_BACK_ID",back.getId()).add("WAREHOUSE_ID",back.getWarehouseId()));
-
-        for (Map myMap : list) {
-            SuperMap map = new SuperMap(myMap);
-
-            CheckUsingParam param = new CheckUsingParam();
-            param.setIsCheckIn(false);
-            param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
-            param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
-            param.setUser_name(map.getString("GOODS_USER_NAME"));
-
-            List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
-            for (CheckUsingResult result : resultList) {
-                BaseWarehouseParam param1 = new DepBackWarehouseParam();
-                param1.setIsCheckIn(true);
-                param1.setWarehouseId(result.getLendingModel().getWarehouseId());
-                param1.setModelId(result.getLendingModel().getBaseGoodsModelsId());
-                param1.setCount(result.getEnd_count() - result.getInitial_count());
-                param1.setFirst_input_type(4);
-
-                //鍏ュ簱骞跺瓨鍏ユ祦姘�
-                CheckWarehouseResult result1  = coreService.unifyCheck(param1).get(0);
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setId(result1.getWhGoods().getFirstInputHisId());
-                details.setBusinessFormId(back.getId());
-                details.setBusinessFormCode(back.getBusinessFormCode());
-                details.setBusinessFormName(back.getWarehouseName() + "杩斿簱鍏ュ簱鍗�:" + details.getBusinessFormCode());
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(1);
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(back.getWarehouseId());
-                details.setWarehouseName(back.getWarehouseName());
-                details.setClassification(1);
-                details.setOperatorId(back.getOperatorId());
-                details.setOperatorName(back.getOperatorName());
-                details.setDealTime(back.getDealTime());
-                details.setWhGoodsId(result1.getWhGoods().getId());
-
-                this.insert(details);
-
-
-                //瀛樺叆鍦ㄧ敤娴佹按
-                UsingGoodsHis his  = new UsingGoodsHis();
-                his.setId(NumberGenerator.getLongSequenceNumber());
-                his.setBusinessFormId(back.getId());
-                his.setBusinessFormCode(back.getBusinessFormCode());
-                his.setBusinessFormName("杩斿簱鍗曪細" + back.getBusinessFormCode());
-                his.setClassification(3);
-                his.setOperatorId(back.getOperatorId());
-                his.setOperatorName(back.getOperatorName());
-                his.setDealTime(back.getDealTime());
-                his.setDepFormLendingModelId(result.getLendingModel().getId());
-                his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
-                his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
-                his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
-                his.setInitialCount(result.getInitial_count());
-                his.setEndCount(result.getEnd_count());
-                his.setWarehouseId(back.getWarehouseId());
-                his.setWarehouseName(back.getWarehouseName());
-                his.setDepartmentId(back.getDepartmentId());
-                his.setDepartmentName(back.getDepartmentName());
-                insert(his);
-
-                DepFormBackModel model = new DepFormBackModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setDepFormBackGoodsId(map.getLong("DEP_FORM_BACK_GOODS_ID"));
-                model.setDepFormBackId(back.getId());
-                model.setWhGoodsDetailsId(result1.getWh_goods_detail_id());
-                model.setUsingGoodsHisId(his.getId());
-                model.setWhGoodsId(his.getWhGoodsId());
-                model.setCounts(his.getThisCount());
-                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
-                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
-                model.setDepFormLendingId(his.getDepFormLendingId());
-                model.setWhGoodsId(his.getWhGoodsId());
-                insert(model);
-            }
-
-        }
-
-
-    }
-
-
-    /**
-     * 閮ㄩ棬鐗╁搧鍒嗗彂
-     */
-    public void doDepLending(DepFormLending lending){
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	DEP_FORM_LENDING_GOODS A \n" +
-                "WHERE\n" +
-                "	A.DEP_FORM_LENDING_ID = :LENDING_ID";
-
-        List<DepFormLendingGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("LENDING_ID",lending.getId()),new DepFormLendingGoods());
-
-        for (DepFormLendingGoods goods : goodsList){
-            BaseWarehouseParam param = new BaseWarehouseParam();
-            param.setIsCheckIn(false);
-            param.setWarehouseId(lending.getWarehouseId());
-            param.setModelId(goods.getBaseGoodsModelsId());
-            param.setCount(goods.getCounts());
-
-            //棣栧厛浠庢満鏋勪粨搴撳嚭搴�
-            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-            for (CheckWarehouseResult result : results){
-                WhGoodsDetails details = new WhGoodsDetails();
-                details.setId(NumberGenerator.getLongSequenceNumber());
-                details.setBusinessFormId(lending.getId());
-                details.setBusinessFormCode(lending.getBusinessFormCode());
-                details.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
-                details.setInitialCount(result.getInitial_count());
-                details.setThisType(2);
-                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-                details.setEndCount(result.getEnd_count());
-                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-                details.setClassification(11);
-                details.setOperatorId(lending.getOperatorId());
-                details.setOperatorName(lending.getOperatorName());
-                details.setDealTime(lending.getDealTime());
-                details.setWhGoodsId(result.getWhGoods().getId());
-                this.insert(details);
-
-                //鍥炲～鍑哄簱娴佹按ID锛岀敤浜庡垎鍙戞椂浣跨敤
-                result.setWh_goods_detail_id(details.getId());
-            }
-
-            CheckUsingParam usingParam = new CheckUsingParam();
-            usingParam.setIsCheckIn(true);
-            usingParam.setInput_type(1);
-            usingParam.setOutputList(results);
-
-            List<CheckUsingResult> usingResults = coreService.unifyUsingCheck(usingParam);
-            for (CheckUsingResult usingResult : usingResults) {
-                UsingGoodsHis his  = new UsingGoodsHis();
-                his.setId(NumberGenerator.getLongSequenceNumber());
-                his.setBusinessFormId(lending.getId());
-                his.setBusinessFormCode(lending.getBusinessFormCode());
-                his.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
-                his.setClassification(1);
-                his.setOperatorId(lending.getOperatorId());
-                his.setOperatorName(lending.getOperatorName());
-                his.setDealTime(lending.getDealTime());
-                his.setDepFormLendingModelId(usingResult.getLendingModel().getId());
-                his.setDepFormLendingGoodsId(usingResult.getLendingModel().getDepFormLendingGoodsId());
-                his.setDepFormLendingId(lending.getId());
-                his.setWhGoodsId(usingResult.getLendingModel().getWhGoodsId());
-                his.setInitialCount(usingResult.getInitial_count());
-                his.setEndCount(usingResult.getEnd_count());
-                his.setWarehouseId(lending.getWarehouseId());
-                his.setWarehouseName(lending.getWarehouseName());
-                his.setDepartmentId(lending.getDepartmentId());
-                his.setDepartmentName(lending.getDepartmentName());
-                insert(his);
-            }
-        }
-    }
-
-    public void doDepScrapped(String dep_form_scrapped_id){
-
-        DepFormScrapped scrapped = get(new DepFormScrapped(),"ID=?",new Object[]{dep_form_scrapped_id});
-
-        String sql = "SELECT\n" +
-                "	B.*,\n" +
-                "	A.SCRAPPED_COUNTS, \n" +
-                "	A.ID AS DEP_FORM_SCRAPPED_GOODS_ID \n" +
-                "FROM\n" +
-                "	DEP_FORM_SCRAPPED_GOODS A\n" +
-                "	LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
-                "WHERE\n" +
-                "	A.DEP_FORM_SCRAPPED_ID = :DEP_FORM_SCRAPPED_ID \n" +
-                "	AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
-                "	AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
-
-        List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getOutWarehouseId()));
-        for (Map _map : list) {
-            SuperMap map = new SuperMap(_map);
-
-            CheckUsingParam param = new CheckUsingParam();
-            param.setIsCheckIn(false);
-            param.setOutputCount(map.getInteger("SCRAPPED_COUNTS"));
-            param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
-            param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
-            param.setUser_name(map.getString("GOODS_USER_NAME"));
-
-            List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
-
-            for (CheckUsingResult result : resultList) {
-
-                //瀛樺叆鍦ㄧ敤娴佹按
-                UsingGoodsHis his  = new UsingGoodsHis();
-                his.setId(NumberGenerator.getLongSequenceNumber());
-                his.setBusinessFormId(scrapped.getId());
-                his.setBusinessFormCode(scrapped.getBusinessFormCode());
-                his.setBusinessFormName("閮ㄩ棬鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
-                his.setClassification(4);
-                his.setOperatorId(scrapped.getOperatorId());
-                his.setOperatorName(scrapped.getOperatorName());
-                his.setDealTime(scrapped.getDealTime());
-                his.setDepFormLendingModelId(result.getLendingModel().getId());
-                his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
-                his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
-                his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
-                his.setInitialCount(result.getInitial_count());
-                his.setEndCount(result.getEnd_count());
-                his.setWarehouseId(scrapped.getOutWarehouseId());
-                his.setWarehouseName(scrapped.getOutWarehouseName());
-//                his.setDepartmentId(scrapped.getDepartmentId());
-//                his.setDepartmentName(scrapped.getDepartmentName());
-                insert(his);
-
-
-                DepFormScrappedModel model = new DepFormScrappedModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
-                model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
-                model.setScrappedCode(map.getLong("SCRAPPED_CODE"));
-                model.setScrappedName(map.getString("SCRAPPED_NAME"));
-//                model.setUsingGoodsHisId(his.getId());
-//                model.setDepFormScrappedId(scrapped.getId());
-//                model.setWhGoodsId(his.getWhGoodsId());
-//                model.setScrappedCounts(his.getThisCount());
-//                model.setInitCount(his.getInitialCount());
-//                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
-//                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
-//                model.setDepFormLendingId(his.getDepFormLendingId());
-                insert(model);
-            }
-        }
-    }
-
-    /**
-     * 鐢ㄤ簬鍙樻洿鐗╁搧浣跨敤浜哄悗锛屾洿鏂板簱瀛樼墿鍝佷娇鐢ㄤ汉淇℃伅銆�
-     * @param dep_form_lending_goods_user_id
-     */
-    public void changeUser(Long dep_form_lending_goods_user_id){
-        DepFormLendingGoodsUser user = get(new DepFormLendingGoodsUser(),"ID=?",new Object[]{dep_form_lending_goods_user_id});
-        DepFormLendingGoods goods = get(new DepFormLendingGoods(),"ID=?",new Object[]{user.getDepFormLendingGoodsId()});
-
-
-        String sql =
-                "UPDATE DEP_FORM_LENDING_MODEL \n" +
-                        "SET NOW_USER_NAME =:NOW_USER_NAME,\n" +
-                        "NOW_USER_PHONE =:NOW_USER_PHONE \n" +
-                        "WHERE\n" +
-                        "	DEP_FORM_LENDING_GOODS_ID =:DEP_FORM_LENDING_GOODS_ID \n" +
-                        "	AND BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID \n" +
-                        "	AND NOW_USER_NAME =:OLD_USER_NAME\n" +
-                        "	AND USING_COUNT > 0";
-
-        List<SqlParameter> parameterList = new ArrayList<>();
-        List<DepFormLendingModel> modelList = select(new DepFormLendingModel(),"DEP_FORM_LENDING_GOODS_ID=?",new Object[]{goods.getId()});
-        for (DepFormLendingModel model : modelList) {
-            if (model.getUsingCount() == 0) continue;
-            SqlParameter parameter = new SqlParameter();
-            parameter.add("NOW_USER_NAME",user.getNowUserName())
-                    .add("NOW_USER_PHONE",user.getNowUserPhone())
-                    .add("DEP_FORM_LENDING_GOODS_ID",goods.getId())
-                    .add("BASE_GOODS_MODELS_ID",goods.getBaseGoodsModelsId())
-                    .add("OLD_USER_NAME",goods.getGoodsUserName());
-            parameterList.add(parameter);
-        }
-        execBatchUpdate(sql,parameterList);
-    }
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
deleted file mode 100644
index 1660943..0000000
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
+++ /dev/null
@@ -1,853 +0,0 @@
-//package com.consum.base.core;
-//
-//import com.consum.base.core.param.BaseWarehouseParam;
-//import com.consum.base.core.param.DepBackWarehouseParam;
-//import com.consum.base.core.utils.SqlParameter;
-//import com.consum.base.core.utils.SuperMap;
-//import com.consum.base.core.utils.DateUtil;
-//import com.consum.model.po.*;
-//import com.walker.infrastructure.utils.NumberGenerator;
-//import com.walker.jdbc.service.BaseServiceImpl;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 杩涘嚭搴� 涓氬姟澶� 绫�
-// */
-//@Service
-//public class WarehouseBusinessServiceBAK extends BaseServiceImpl {
-//
-//
-//    @Autowired
-//    private WarehouseCoreService coreService;
-//
-//    /**
-//     * 鎵ц閲囪喘鍏ュ簱
-//     * 绗竴姝ワ細閫氳繃閲囪喘鍗曘�怶H_FORM_PROCURE銆戞煡璇㈤噰璐崟鍨嬪彿銆怶H_FORM_PROCURE_MODEL銆戞暟鎹�
-//     * 绗簩姝ワ細缁勭粐CheckWarehouseParam锛岃皟鐢╓arehouseCoreService.unifyCheck()鎵ц鍏ュ簱
-//     * 绗笁姝ワ細鏇存柊閲囪喘鍗曞瀷鍙枫�怶H_FORM_PROCURE_MODEL銆戝簱瀛樼墿鍝佺紪鍙峰瓧娈靛強涓昏〃WH_FORM_PROCURE鐘舵�佷俊鎭�
-//     * 绗洓姝ワ細鏇存柊 杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-//     * @param procure
-//     */
-//    public void doProcure(WhFormProcure procure){
-//
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_PROCURE_MODEL A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_PROCURE_ID = :PROCURE_ID";
-//
-//        List<WhFormProcureModel>  modelList = this.select(sql,new SqlParameter().put("PROCURE_ID",procure.getId()),new WhFormProcureModel());
-//
-//        for (WhFormProcureModel model : modelList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(true);
-//            param.setWarehouseId(procure.getId());
-//            param.setCount(model.getCounts());
-//            param.setFirstInputCode(model.getId().toString());
-//            param.setFirst_input_type(1);
-//            param.setModelId(model.getBaseGoodsModelsId());
-//            CheckWarehouseResult result =  coreService.unifyCheck(param).get(0);
-//
-//
-//            WhGoodsDetails details = new WhGoodsDetails();
-//            details.setId(result.getWhGoods().getFirstInputHisId());
-//            details.setBusinessFormId(procure.getId());
-//            details.setBusinessFormCode(procure.getBusinessFormCode());
-//            details.setBusinessFormName(procure.getWarehouseName() + "閲囪喘鍏ュ簱鍗�:" + details.getBusinessFormCode());
-//            details.setInitialCount(result.getInitial_count());
-//            details.setThisType(1);
-//            details.setEndCount(result.getEnd_count());
-//            details.setWarehouseId(param.getWarehouseId());
-//            details.setWarehouseName(procure.getWarehouseName());
-//            details.setClassification(1);
-//            details.setOperatorId(procure.getOperatorId2());
-//            details.setOperatorName(procure.getOperatorName2());
-//            details.setDealTime(procure.getIncomeTime());
-//            details.setWhGoodsId(result.getWhGoods().getId());
-//
-//            this.insert(details);
-//
-//
-//            model.setInWhGoodsDetailsId(details.getId());
-//            update(model);
-//
-//            procure.setStates(2);
-//            update(procure);
-//        }
-//    }
-//    public void doOutPut(WhFormOutput output){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_OUTPUT_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_OUTPUT_ID = :OUTPUT_ID";
-//
-//        List<WhFormOutputGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("OUTPUT_ID",output.getId()),new WhFormOutputGoods());
-//
-//        for (WhFormOutputGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(false);
-//            param.setWarehouseId(output.getWarehouseId());
-//            param.setModelId(goods.getBaseGoodsModelsId());
-//            param.setCount(goods.getCounts());
-//
-//            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-//            for (CheckWarehouseResult result : results){
-//                WhFormOutputModel model = new WhFormOutputModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setCounts(result.getInitial_count() - result.getEnd_count());
-//                model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
-//                model.setWhGoodsId(result.getWhGoods().getId());
-//                model.setWhFormOutputId(output.getId());
-//                model.setWhFormOutputGoodsId(goods.getId());
-//                insert(model);
-//
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setBusinessFormId(output.getId());
-//                details.setBusinessFormCode(output.getBusinessFormCode());
-//                details.setBusinessFormName("鍑哄簱鍗曪細" + output.getBusinessFormCode());
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(2);
-//                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//                details.setClassification(3);
-//                details.setOperatorId(output.getOperatorId());
-//                details.setOperatorName(output.getOperatorName());
-//                details.setDealTime(output.getDealTime());
-//                details.setWhGoodsId(result.getWhGoods().getId());
-//                this.insert(details);
-//            }
-//        }
-//    }
-//
-//
-//    /**
-//     * 鎵ц璋冩嫧鍑哄簱鎿嶄綔
-//     * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
-//     * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
-//     * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-//     * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负寰呮帴鏀讹紝鏇存柊璋冩嫧鍗曠墿鍝併�怶H_FORM_TRANSFER_MODEL銆戝嚭搴撴祦姘碔D
-//     * @param transfer
-//     */
-//    public void doTransferOutPut(WhFormTransfer transfer){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_TRANSFER_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
-//
-//        List<WhFormTransferGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("TRANSFER_ID",transfer.getId()),new WhFormTransferGoods());
-//
-//        for (WhFormTransferGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(false);
-//            param.setWarehouseId(transfer.getOutWarehouseId());
-//            param.setCount(goods.getCounts());
-//            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-//            for (CheckWarehouseResult result : results){
-//                WhFormTransferModel model = new WhFormTransferModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setWhFormTransferId(transfer.getId());
-//                model.setWorehouseCount(result.getInitial_count());
-//                model.setCounts(result.getInitial_count() - result.getEnd_count());
-//                model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
-//                model.setWhFormTransferGoodsId(goods.getId());
-//                insert(model);
-//
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setBusinessFormId(transfer.getId());
-//                details.setBusinessFormCode(transfer.getBusinessFormCode());
-//                details.setBusinessFormName("璋冩嫧鍑哄簱鍗曪細" + transfer.getBusinessFormCode());
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(2);
-//                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//                details.setClassification(5);
-//                details.setOperatorId(transfer.getOperatorId());
-//                details.setOperatorName(transfer.getOperatorName());
-//                details.setDealTime(transfer.getOutputTime());
-//                details.setWhGoodsId(result.getWhGoods().getId());
-//                this.insert(details);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 鎵ц璋冩嫧鍏ュ簱鎿嶄綔
-//     * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
-//     * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
-//     * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
-//     * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负宸插叆搴擄紝锛屾洿鏂拌皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_MODEL銆戝叆搴撴祦姘碔D
-//     * @param transfer
-//     */
-//    public void doTransferInPut(WhFormTransfer transfer){
-//
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_TRANSFER_MODEL A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
-//
-//        List<WhFormTransferModel>  modelsList = this.select(sql,new SqlParameter()
-//                                    .put("TRANSFER_ID",transfer.getId()),new WhFormTransferModel());
-//
-//        for (WhFormTransferModel model : modelsList) {
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(true);
-//            param.setWarehouseId(transfer.getInWarehouseId());
-//            param.setCount(model.getCounts());
-//            param.setWh_goods_id(model.getWhGoodsId());
-//            CheckWarehouseResult result = coreService.unifyCheck(param).get(0);
-//
-//            WhGoodsDetails details = new WhGoodsDetails();
-//            details.setBusinessFormId(transfer.getId());
-//            details.setBusinessFormCode(transfer.getBusinessFormCode());
-//            details.setBusinessFormName("璋冩嫧鍏ュ簱鍗曪細" + transfer.getBusinessFormCode());
-//            details.setInitialCount(result.getInitial_count());
-//            details.setThisType(1);
-//            details.setThisCount(result.getEnd_count()-result.getInitial_count());
-//            details.setEndCount(result.getEnd_count());
-//            details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//            details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//            details.setClassification(4);
-//            details.setOperatorId(transfer.getOperatorId2());
-//            details.setOperatorName(transfer.getOperatorName2());
-//            details.setDealTime(transfer.getIninputTime());
-//            details.setWhGoodsId(result.getWhGoods().getId());
-//            this.insert(details);
-//
-//            model.setInWhGoodsDetailsId(details.getId());
-//            update(model);
-//        }
-//    }
-//
-//    /**
-//     * 鎶ュ簾鍗�
-//     * @param scrapped
-//     */
-//    public void doScrapped(WhFormScrapped scrapped){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_SCRAPPED_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.DEP_FORM_SCRAPPED_ID = :SCRAPPED_ID";
-//
-//        List<WhFormScrappedGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("SCRAPPED_ID",scrapped.getId()),new WhFormScrappedGoods());
-//
-//        for (WhFormScrappedGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(false);
-//            param.setWarehouseId(scrapped.getWarehouseId());
-//            param.setCount(goods.getCounts());
-//            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-//            for (CheckWarehouseResult result : results){
-//
-//
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setBusinessFormId(scrapped.getId());
-//                details.setBusinessFormCode(scrapped.getBusinessFormCode());
-//                details.setBusinessFormName("鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(2);
-//                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//                details.setClassification(10);
-//                details.setOperatorId(scrapped.getOperatorId());
-//                details.setOperatorName(scrapped.getOperatorName());
-//                details.setDealTime(scrapped.getDealTime());
-//                details.setWhGoodsId(result.getWhGoods().getId());
-//                this.insert(details);
-//
-//
-//                WhFormScrappedModel model = new WhFormScrappedModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setCounts(result.getWhGoods().getWhCount());
-//                model.setScrappedCode(goods.getScrappedCode());
-//                model.setScrappedName(goods.getScrappedName());
-//                model.setDepGoodsDetailsId(details.getId());
-//                model.setDepFormScrappedId(scrapped.getId());
-//                model.setWhGoodsId(result.getWhGoods().getId());
-//                model.setWhFormScrappedGoodsId(goods.getId());
-//                insert(model);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 鍒涘缓鐩樼偣浠诲姟锛屽垱寤虹洏鐐逛换鍔℃椂锛屾牴鎹綋鏃舵椂闂翠細灏嗗簱瀛樻暟鎹喕缁撲竴浠芥斁鍏ュ緟鐩樼偣鍗曘��
-//     * 1.浠庡簱瀛樼墿鍝併�怶H_GOODS銆戜腑鎸夌収浠撳簱灏嗘暟鎹斁鍏ョ洏鐐瑰崟鐗╁搧銆怶H_FORM_INVENTORY_GOODS銆戯紝涓昏鏄�
-//     * 鏈熷垵鏁伴噺INIT_COUNTS锛屽拰 搴撳瓨鐗╁搧缂栧彿WH_GOODS_ID瀛楁
-//     * @param inventory
-//     */
-//    public void createInventoryForm(WhFormInventory inventory){
-//        String sql =
-//                "SELECT\n" +
-//                        "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                        "	b.GOODS_TEMPLATE_NAME,\n" +
-//                        "	SUM( b.WH_COUNT ) AS WH_COUNT,\n" +
-//                        "	b.BASE_GOODS_MODELS_ID,\n" +
-//                        "	b.BASE_GOODS_MODELS_NAME,\n" +
-//                        "	b.UNIT \n" +
-//                        "FROM\n" +
-//                        "	(\n" +
-//                        "	SELECT\n" +
-//                        "		ID \n" +
-//                        "	FROM\n" +
-//                        "		BASE_GOODS_MODELS m \n" +
-//                        "	WHERE\n" +
-//                        "		STATES != 3 \n" +
-//                        "		AND EXISTS ( SELECT 1 FROM BASE_GOODS_TEMPLATE t WHERE t.ID = m.GOODS_TEMPLATES_ID AND t.STATES != 3 ) \n" +
-//                        "	) a\n" +
-//                        "	LEFT JOIN wh_goods b ON a.ID = b.BASE_GOODS_MODELS_ID \n" +
-//                        "WHERE\n" +
-//                        "	b.STATES = 1 \n" +
-//                        "	AND b.WAREHOUSE_ID =:WAREHOUSE_ID \n" +
-//                        "GROUP BY\n" +
-//                        "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                        "	b.GOODS_TEMPLATE_NAME,\n" +
-//                        "	b.BASE_GOODS_MODELS_ID,\n" +
-//                        "	b.BASE_GOODS_MODELS_NAME";
-//
-//        List<WhGoods> goodsList = select(sql,new SqlParameter().add("WAREHOUSE_ID",inventory.getWarehouseId()));
-//        List<WhFormInventoryGoods> list = new ArrayList<>();
-//        for (WhGoods goods : goodsList) {
-//            WhFormInventoryGoods inventoryGoods = new WhFormInventoryGoods();
-//            inventoryGoods.setId(NumberGenerator.getLongSequenceNumber());
-//            inventoryGoods.setWhFormInventoryId(inventory.getId());
-//            inventoryGoods.setBaseGoodsTemplateId(goods.getBaseGoodsTemplateId());
-//            inventoryGoods.setGoodsTemplateName(goods.getGoodsTemplateName());
-//            inventoryGoods.setUnit(goods.getUnit());
-//            inventoryGoods.setBaseGoodsModelsId(goods.getBaseGoodsModelsId());
-//            inventoryGoods.setBaseGoodsModelsName(goods.getBaseGoodsModelsName());
-//            inventoryGoods.setInitCounts(goods.getWhCount());
-//            inventoryGoods.setInitCounts(null);
-//            inventoryGoods.setErrorCounts(null);
-//            inventoryGoods.setInventoryResult(1);
-//            list.add(inventoryGoods);
-//        }
-//        insertBatch(list);
-//
-//    }
-//
-//    /**
-//     * 鐩樼偣鍑哄簱
-//     * @param inventory
-//     */
-//    public void doInventoryOutput(WhFormInventory inventory){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_INVENTORY_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
-//                "  AND A.INVENTORY_RESULT =3 ";
-//
-//        List<WhFormInventoryGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
-//
-//        for (WhFormInventoryGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(false);
-//            param.setWarehouseId(inventory.getWarehouseId());
-//            param.setCount(goods.getErrorCounts());
-//            param.setModelId(goods.getBaseGoodsModelsId());
-//            param.setOutput_type(3);
-//            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-//            for (CheckWarehouseResult result : results){
-//
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setBusinessFormId(inventory.getId());
-//                details.setBusinessFormCode(inventory.getBusinessFormCode());
-//                details.setBusinessFormName("鐩樼偣鍑哄崟锛�" + inventory.getBusinessFormCode());
-//
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(2);
-//                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//                details.setClassification(9);
-//                details.setOperatorId(inventory.getOperatorId());
-//                details.setOperatorName(inventory.getOperatorName());
-//                details.setDealTime(inventory.getStopTime());
-//                details.setWhGoodsId(result.getWhGoods().getId());
-//                this.insert(details);
-//
-//
-//                WhFormInventoryModel model = new WhFormInventoryModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setCounts(result.getWhGoods().getWhCount());
-//                model.setWhFormInventoryId(inventory.getId());
-//                model.setInventoryResult(3);
-//                model.setWhGoodsDetailsId(details.getId());
-//                model.setWhFormInventoryGoodsId(goods.getId());
-//                model.setWhGoodsId(result.getWhGoods().getId());
-//                insert(model);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 鐩樼偣鍏ュ簱
-//     * @param inventory
-//     */
-//    public void doInventoryInput(WhFormInventory inventory){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	WH_FORM_INVENTORY_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
-//                "  AND A.INVENTORY_RESULT =2 ";
-//
-//        List<WhFormInventoryGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
-//
-//        for (WhFormInventoryGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(true);
-//            param.setWarehouseId(inventory.getWarehouseId());
-//            param.setCount(goods.getErrorCounts());
-//            param.setModelId(goods.getBaseGoodsModelsId());
-//            param.setFirst_input_type(3);
-//            CheckWarehouseResult result =  coreService.unifyCheck(param).get(0);
-//
-//            WhGoodsDetails details = new WhGoodsDetails();
-//            details.setBusinessFormId(inventory.getId());
-//            details.setBusinessFormCode(inventory.getBusinessFormCode());
-//            details.setBusinessFormName("鐩樼偣鍏ュ簱鍗曪細" + inventory.getBusinessFormCode());
-//
-//            details.setInitialCount(result.getInitial_count());
-//            details.setThisType(1);
-//            details.setThisCount(result.getEnd_count()-result.getInitial_count());
-//            details.setEndCount(result.getEnd_count());
-//            details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//            details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//            details.setClassification(8);
-//            details.setOperatorId(inventory.getOperatorId());
-//            details.setOperatorName(inventory.getOperatorName());
-//            details.setDealTime(inventory.getStopTime());
-//            details.setWhGoodsId(result.getWhGoods().getId());
-//            this.insert(details);
-//
-//
-//            WhFormInventoryModel model = new WhFormInventoryModel();
-//            model.setId(NumberGenerator.getLongSequenceNumber());
-//            model.setCounts(result.getWhGoods().getWhCount());
-//            model.setWhFormInventoryId(inventory.getId());
-//            model.setInventoryResult(3);
-//            model.setWhGoodsDetailsId(details.getId());
-//            model.setWhFormInventoryGoodsId(goods.getId());
-//            model.setWhGoodsId(result.getWhGoods().getId());
-//            insert(model);
-//        }
-//    }
-//
-//    /**
-//     * 缁熶竴澶勭悊搴撳瓨棰勮锛堝畾鏃朵换鍔¤皟鐢ㄦ湇鍔★級
-//     * 璁″垝锛氭瘡澶╀腑鍗�13锛�00銆佹櫄涓�1:00鎵ц涓ゆ
-//     */
-//    public void insertWarning(){
-//
-//        String sql = "SELECT\n" +
-//                "	SUM(b.WH_COUNT) AS WH_COUNT,\n" +
-//                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                "	b.GOODS_TEMPLATE_NAME,\n" +
-//                "   b.WAREHOUSE_ID,\n" +
-//                "	a.UPPER_LIMIT,\n" +
-//                "	a.LOWER_LIMIT \n" +
-//                "FROM\n" +
-//                "	WH_WARNING_CONFIG a\n" +
-//                "	LEFT JOIN wh_goods b ON a.BASE_GOODS_TEMPLATE_ID = b.BASE_GOODS_TEMPLATE_ID \n" +
-//                "WHERE\n" +
-//                "	a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
-//                "	AND b.STATES = 1 \n" +
-//                "	AND a.GOODS_TYPE=1\n" +
-//                " 	AND  ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
-//                "GROUP BY\n" +
-//                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                "	b.GOODS_TEMPLATE_NAME,\n" +
-//                "   b.WAREHOUSE_ID,\n" +
-//                "	a.UPPER_LIMIT,\n" +
-//                "	a.LOWER_LIMIT";
-//
-//        List<Map> goodslist = select(sql,new SqlParameter());
-//
-//        sql = "SELECT\n" +
-//                "	SUM(b.WH_COUNT) AS WH_COUNT,\n" +
-//                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                "	b.GOODS_TEMPLATE_NAME,\n" +
-//                "	b.BASE_GOODS_MODELS_ID,\n" +
-//                "	b.BASE_GOODS_MODELS_NAME,\n" +
-//                "   b.WAREHOUSE_ID,\n" +
-//                "	a.UPPER_LIMIT,\n" +
-//                "	a.LOWER_LIMIT \n" +
-//                "FROM\n" +
-//                "	WH_WARNING_CONFIG a\n" +
-//                "	LEFT JOIN wh_goods b ON a.BASE_GOODS_MODELS_ID = b.BASE_GOODS_MODELS_ID \n" +
-//                "WHERE\n" +
-//                "	a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
-//                "	AND b.STATES = 1 \n" +
-//                "	AND a.GOODS_TYPE=2\n" +
-//                " 	AND  ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
-//                "GROUP BY\n" +
-//                "	b.BASE_GOODS_TEMPLATE_ID,\n" +
-//                "	b.GOODS_TEMPLATE_NAME,\n" +
-//                "	b.BASE_GOODS_MODELS_ID,\n" +
-//                "	b.BASE_GOODS_MODELS_NAME,\n" +
-//                "   b.WAREHOUSE_ID,\n" +
-//                "	a.UPPER_LIMIT,\n" +
-//                "	a.LOWER_LIMIT";
-//
-//        List<Map> modeslist = select(sql,new SqlParameter());
-//
-//        List<Map> list = new ArrayList<>();
-//        list.addAll(goodslist);
-//        list.addAll(modeslist);
-//
-//        List<WhWarning> warningList = new ArrayList<>();
-//        for (Map map : list) {
-//            SuperMap superMap = new SuperMap(map);
-//            BaseWarehouse warehouse = get(new BaseWarehouse(),"ID=?",new Object[]{superMap.get("WAREHOUSE_ID")});
-//
-//            WhWarning warning = new WhWarning();
-//            warning.setId(NumberGenerator.getLongSequenceNumber());
-//            warning.setBaseWarehouseId(warehouse.getId());
-//            warning.setBaseWarehouseName(warehouse.getWarehouseName());
-//            warning.setBaseGoodsTemplateId(superMap.getLong("BASE_GOODS_TEMPLATE_ID"));
-//            warning.setBaseGoodsTemplateName(superMap.getString("GOODS_TEMPLATE_NAME"));
-//            if (superMap.getString("BASE_GOODS_MODELS_ID") == null){
-//                warning.setGoodsType(1);
-//            } else {
-//                warning.setBaseGoodsModelsId(superMap.getLong("BASE_GOODS_MODELS_ID"));
-//                warning.setBaseGoodsModelsName(superMap.getString("BASE_GOODS_MODELS_NAME"));
-//                warning.setGoodsType(2);
-//            }
-//
-//            int whCount = superMap.getInteger("WH_COUNT");
-//            int upCount = superMap.getInteger("UPPER_LIMIT");
-//            int lowCount = superMap.getInteger("LOWER_LIMIT");
-//
-//            if (whCount >= upCount){
-//                warning.setWarningType(1);
-//            }
-//            if (whCount<=lowCount){
-//                warning.setWarningType(2);
-//            }
-//
-//            warning.setUpperLimit(upCount);
-//            warning.setLowerLimit(lowCount);
-//            warning.setWarehouseCount(whCount);
-//            warning.setStates(1);
-//            warning.setWarningTime(DateUtil.getCurrentDateFor14());
-//            warning.setAgencyId(warehouse.getAgencyId());
-//            warning.setAgencyName(warehouse.getAgencyName());
-//
-//            warningList.add(warning);
-//        }
-//
-//        insertBatch(warningList);
-//    }
-//
-//    public void doDepBack(String depFormBackId){
-//
-//        DepFormBack back = get(new DepFormBack(),"ID=?",new Object[]{depFormBackId});
-//
-//        String sql = "SELECT\n" +
-//                "	B.*,\n" +
-//                "	A.BACK_COUNTS, \n" +
-//                "	A.ID AS DEP_FORM_BACK_GOODS_ID \n" +
-//                "FROM\n" +
-//                "	DEP_FORM_BACK_GOODS A\n" +
-//                "	LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
-//                "WHERE\n" +
-//                "	A.DEP_FORM_BACK_ID = :DEP_FORM_BACK_ID \n" +
-//                "	AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
-//                "	AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
-//
-//        List<Map> list = select(sql,new SqlParameter("DEP_FORM_BACK_ID",back.getId()).add("WAREHOUSE_ID",back.getWarehouseId()));
-//
-//        for (Map myMap : list) {
-//            SuperMap map = new SuperMap(myMap);
-//
-//            CheckUsingParam param = new CheckUsingParam();
-//            param.setIsCheckIn(false);
-//            param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
-//            param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
-//            param.setUser_name(map.getString("GOODS_USER_NAME"));
-//
-//            List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
-//            for (CheckUsingResult result : resultList) {
-//                BaseWarehouseParam param1 = new DepBackWarehouseParam();
-//                param1.setIsCheckIn(true);
-//                param1.setWarehouseId(result.getLendingModel().getWarehouseId());
-//                param1.setModelId(result.getLendingModel().getBaseGoodsModelsId());
-//                param1.setCount(result.getEnd_count() - result.getInitial_count());
-//                param1.setFirst_input_type(4);
-//
-//                //鍏ュ簱骞跺瓨鍏ユ祦姘�
-//                CheckWarehouseResult result1  = coreService.unifyCheck(param1).get(0);
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setId(result1.getWhGoods().getFirstInputHisId());
-//                details.setBusinessFormId(back.getId());
-//                details.setBusinessFormCode(back.getBusinessFormCode());
-//                details.setBusinessFormName(back.getWarehouseName() + "杩斿簱鍏ュ簱鍗�:" + details.getBusinessFormCode());
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(1);
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(back.getWarehouseId());
-//                details.setWarehouseName(back.getWarehouseName());
-//                details.setClassification(1);
-//                details.setOperatorId(back.getOperatorId());
-//                details.setOperatorName(back.getOperatorName());
-//                details.setDealTime(back.getDealTime());
-//                details.setWhGoodsId(result1.getWhGoods().getId());
-//
-//                this.insert(details);
-//
-//
-//                //瀛樺叆鍦ㄧ敤娴佹按
-//                UsingGoodsHis his  = new UsingGoodsHis();
-//                his.setId(NumberGenerator.getLongSequenceNumber());
-//                his.setBusinessFormId(back.getId());
-//                his.setBusinessFormCode(back.getBusinessFormCode());
-//                his.setBusinessFormName("杩斿簱鍗曪細" + back.getBusinessFormCode());
-//                his.setClassification(3);
-//                his.setOperatorId(back.getOperatorId());
-//                his.setOperatorName(back.getOperatorName());
-//                his.setDealTime(back.getDealTime());
-//                his.setDepFormLendingModelId(result.getLendingModel().getId());
-//                his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
-//                his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
-//                his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
-//                his.setInitialCount(result.getInitial_count());
-//                his.setEndCount(result.getEnd_count());
-//                his.setWarehouseId(back.getWarehouseId());
-//                his.setWarehouseName(back.getWarehouseName());
-//                his.setDepartmentId(back.getDepartmentId());
-//                his.setDepartmentName(back.getDepartmentName());
-//                insert(his);
-//
-//                DepFormBackModel model = new DepFormBackModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setDepFormBackGoodsId(map.getLong("DEP_FORM_BACK_GOODS_ID"));
-//                model.setDepFormBackId(back.getId());
-//                model.setWhGoodsDetailsId(result1.getWh_goods_detail_id());
-//                model.setUsingGoodsHisId(his.getId());
-//                model.setWhGoodsId(his.getWhGoodsId());
-//                model.setCounts(his.getThisCount());
-//                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
-//                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
-//                model.setDepFormLendingId(his.getDepFormLendingId());
-//                model.setWhGoodsId(his.getWhGoodsId());
-//                insert(model);
-//            }
-//
-//        }
-//
-//
-//    }
-//
-//
-//    /**
-//     * 閮ㄩ棬鐗╁搧鍒嗗彂
-//     */
-//    public void doDepLending(DepFormLending lending){
-//        String sql = "SELECT\n" +
-//                "	* \n" +
-//                "FROM\n" +
-//                "	DEP_FORM_LENDING_GOODS A \n" +
-//                "WHERE\n" +
-//                "	A.DEP_FORM_LENDING_ID = :LENDING_ID";
-//
-//        List<DepFormLendingGoods>  goodsList = this.select(sql,new SqlParameter()
-//                .put("LENDING_ID",lending.getId()),new DepFormLendingGoods());
-//
-//        for (DepFormLendingGoods goods : goodsList){
-//            BaseWarehouseParam param = new BaseWarehouseParam();
-//            param.setIsCheckIn(false);
-//            param.setWarehouseId(lending.getWarehouseId());
-//            param.setModelId(goods.getBaseGoodsModelsId());
-//            param.setCount(goods.getCounts());
-//
-//            //棣栧厛浠庢満鏋勪粨搴撳嚭搴�
-//            List<CheckWarehouseResult> results =  coreService.unifyCheck(param);
-//            for (CheckWarehouseResult result : results){
-//                WhGoodsDetails details = new WhGoodsDetails();
-//                details.setId(NumberGenerator.getLongSequenceNumber());
-//                details.setBusinessFormId(lending.getId());
-//                details.setBusinessFormCode(lending.getBusinessFormCode());
-//                details.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
-//                details.setInitialCount(result.getInitial_count());
-//                details.setThisType(2);
-//                details.setThisCount(result.getInitial_count() - result.getEnd_count());
-//                details.setEndCount(result.getEnd_count());
-//                details.setWarehouseId(result.getWhGoods().getWarehouseId());
-//                details.setWarehouseName(result.getWhGoods().getWarehouseName());
-//                details.setClassification(11);
-//                details.setOperatorId(lending.getOperatorId());
-//                details.setOperatorName(lending.getOperatorName());
-//                details.setDealTime(lending.getDealTime());
-//                details.setWhGoodsId(result.getWhGoods().getId());
-//                this.insert(details);
-//
-//                //鍥炲～鍑哄簱娴佹按ID锛岀敤浜庡垎鍙戞椂浣跨敤
-//                result.setWh_goods_detail_id(details.getId());
-//            }
-//
-//            CheckUsingParam usingParam = new CheckUsingParam();
-//            usingParam.setIsCheckIn(true);
-//            usingParam.setInput_type(1);
-//            usingParam.setOutputList(results);
-//
-//            List<CheckUsingResult> usingResults = coreService.unifyUsingCheck(usingParam);
-//            for (CheckUsingResult usingResult : usingResults) {
-//                UsingGoodsHis his  = new UsingGoodsHis();
-//                his.setId(NumberGenerator.getLongSequenceNumber());
-//                his.setBusinessFormId(lending.getId());
-//                his.setBusinessFormCode(lending.getBusinessFormCode());
-//                his.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
-//                his.setClassification(1);
-//                his.setOperatorId(lending.getOperatorId());
-//                his.setOperatorName(lending.getOperatorName());
-//                his.setDealTime(lending.getDealTime());
-//                his.setDepFormLendingModelId(usingResult.getLendingModel().getId());
-//                his.setDepFormLendingGoodsId(usingResult.getLendingModel().getDepFormLendingGoodsId());
-//                his.setDepFormLendingId(lending.getId());
-//                his.setWhGoodsId(usingResult.getLendingModel().getWhGoodsId());
-//                his.setInitialCount(usingResult.getInitial_count());
-//                his.setEndCount(usingResult.getEnd_count());
-//                his.setWarehouseId(lending.getWarehouseId());
-//                his.setWarehouseName(lending.getWarehouseName());
-//                his.setDepartmentId(lending.getDepartmentId());
-//                his.setDepartmentName(lending.getDepartmentName());
-//                insert(his);
-//            }
-//        }
-//    }
-//
-//    public void doDepScrapped(String dep_form_scrapped_id){
-//
-//        DepFormScrapped scrapped = get(new DepFormScrapped(),"ID=?",new Object[]{dep_form_scrapped_id});
-//
-//        String sql = "SELECT\n" +
-//                "	B.*,\n" +
-//                "	A.SCRAPPED_COUNTS, \n" +
-//                "	A.ID AS DEP_FORM_SCRAPPED_GOODS_ID \n" +
-//                "FROM\n" +
-//                "	DEP_FORM_SCRAPPED_GOODS A\n" +
-//                "	LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
-//                "WHERE\n" +
-//                "	A.DEP_FORM_SCRAPPED_ID = :DEP_FORM_SCRAPPED_ID \n" +
-//                "	AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
-//                "	AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
-//
-//        List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getWarehouseId()));
-//        for (Map _map : list) {
-//            SuperMap map = new SuperMap(_map);
-//
-//            CheckUsingParam param = new CheckUsingParam();
-//            param.setIsCheckIn(false);
-//            param.setOutputCount(map.getInteger("SCRAPPED_COUNTS"));
-//            param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
-//            param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
-//            param.setUser_name(map.getString("GOODS_USER_NAME"));
-//
-//            List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
-//
-//            for (CheckUsingResult result : resultList) {
-//
-//                //瀛樺叆鍦ㄧ敤娴佹按
-//                UsingGoodsHis his  = new UsingGoodsHis();
-//                his.setId(NumberGenerator.getLongSequenceNumber());
-//                his.setBusinessFormId(scrapped.getId());
-//                his.setBusinessFormCode(scrapped.getBusinessFormCode());
-//                his.setBusinessFormName("閮ㄩ棬鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
-//                his.setClassification(4);
-//                his.setOperatorId(scrapped.getOperatorId());
-//                his.setOperatorName(scrapped.getOperatorName());
-//                his.setDealTime(scrapped.getDealTime());
-//                his.setDepFormLendingModelId(result.getLendingModel().getId());
-//                his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
-//                his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
-//                his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
-//                his.setInitialCount(result.getInitial_count());
-//                his.setEndCount(result.getEnd_count());
-//                his.setWarehouseId(scrapped.getWarehouseId());
-//                his.setWarehouseName(scrapped.getWarehouseName());
-//                his.setDepartmentId(scrapped.getDepartmentId());
-//                his.setDepartmentName(scrapped.getDepartmentName());
-//                insert(his);
-//
-//
-//                DepFormScrappedModel model = new DepFormScrappedModel();
-//                model.setId(NumberGenerator.getLongSequenceNumber());
-//                model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
-//                model.setScrappedCode(map.getString("SCRAPPED_CODE"));
-//                model.setScrappedName(map.getString("SCRAPPED_NAME"));
-//                model.setUsingGoodsHisId(his.getId());
-//                model.setDepFormScrappedId(scrapped.getId());
-//                model.setWhGoodsId(his.getWhGoodsId());
-//                model.setScrappedCounts(his.getThisCount());
-//                model.setInitCount(his.getInitialCount());
-//                model.setDepFormLendingModelId(his.getDepFormLendingModelId());
-//                model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
-//                model.setDepFormLendingId(his.getDepFormLendingId());
-//                insert(model);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 鐢ㄤ簬鍙樻洿鐗╁搧浣跨敤浜哄悗锛屾洿鏂板簱瀛樼墿鍝佷娇鐢ㄤ汉淇℃伅銆�
-//     * @param dep_form_lending_goods_user_id
-//     */
-//    public void changeUser(Long dep_form_lending_goods_user_id){
-//        DepFormLendingGoodsUser user = get(new DepFormLendingGoodsUser(),"ID=?",new Object[]{dep_form_lending_goods_user_id});
-//        DepFormLendingGoods goods = get(new DepFormLendingGoods(),"ID=?",new Object[]{user.getDepFormLendingGoodsId()});
-//
-//
-//        String sql =
-//                "UPDATE DEP_FORM_LENDING_MODEL \n" +
-//                        "SET NOW_USER_NAME =:NOW_USER_NAME,\n" +
-//                        "NOW_USER_PHONE =:NOW_USER_PHONE \n" +
-//                        "WHERE\n" +
-//                        "	DEP_FORM_LENDING_GOODS_ID =:DEP_FORM_LENDING_GOODS_ID \n" +
-//                        "	AND BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID \n" +
-//                        "	AND NOW_USER_NAME =:OLD_USER_NAME\n" +
-//                        "	AND USING_COUNT > 0";
-//
-//        List<SqlParameter> parameterList = new ArrayList<>();
-//        List<DepFormLendingModel> modelList = select(new DepFormLendingModel(),"DEP_FORM_LENDING_GOODS_ID=?",new Object[]{goods.getId()});
-//        for (DepFormLendingModel model : modelList) {
-//            if (model.getUsingCount() == 0) continue;
-//            SqlParameter parameter = new SqlParameter();
-//            parameter.add("NOW_USER_NAME",user.getNowUserName())
-//                    .add("NOW_USER_PHONE",user.getNowUserPhone())
-//                    .add("DEP_FORM_LENDING_GOODS_ID",goods.getId())
-//                    .add("BASE_GOODS_MODELS_ID",goods.getBaseGoodsModelsId())
-//                    .add("OLD_USER_NAME",goods.getGoodsUserName());
-//            parameterList.add(parameter);
-//        }
-//        execBatchUpdate(sql,parameterList);
-//    }
-//}
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
deleted file mode 100644
index 265d3ad..0000000
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package com.consum.base.core;
-
-import com.consum.base.core.param.BaseWarehouseParam;
-import com.consum.base.core.utils.DateUtil;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.core.utils.SqlParameter;
-import com.consum.model.po.*;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.jdbc.service.BaseServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 鏍稿績鍑哄叆搴撴帴鍙�
- */
-@Service
-@Slf4j
-@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-public class WarehouseCoreService extends BaseServiceImpl {
-
-    public static void main(String[] args) {
-        WhGoods goods = new WhGoods();
-        goods.setId(1l);
-        goods.setWarehouseId(111l);
-        goods.setSupplier("娌冲崡閲戞槑婧�");
-
-        WhGoods_mapper mapper = new WhGoods_mapper(goods);
-        System.out.println(mapper.getInsertSql_().getParameters());
-        System.out.println(mapper.getInsertSql_().getSql());
-    }
-
-
-
-    /**
-     * 缁熶竴鍑哄叆搴�
-     */
-    public List<CheckUsingResult> unifyUsingCheck(CheckUsingParam param) {
-        // TODO: 10/10/2023 姝ゅ鍔犱簡鍞竴閿侊紝浼氬奖鍝嶆�ц兘锛屾�濊�冩槸鍚︽湁鏇村悎閫傜殑鍔炴硶
-        try {
-
-            List<CheckUsingResult> results;
-
-
-            String key = param.getLending_id().toString();
-
-            /**
-             * 姝ゅ灏嗗悓涓�涓粨搴撲笅鐨勫悓涓�涓瀷鍙蜂笂閿侊紝涓嶅悓浠撳簱銆佷笉鍚屽瀷鍙蜂笉鍙楀奖鍝嶃��
-             */
-            synchronized (key) {
-                if (param.getIsCheckIn()) {
-                    results = checkUsingIn(param);
-                } else {
-                    results = checkUsingOut(param);
-                }
-            }
-            return results;
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new RuntimeException(e.getMessage());
-        }
-
-    }
-
-    /**
-     * 缁熶竴鍑哄叆搴�
-     */
-    public List<CheckWarehouseResult> unifyCheck(BaseWarehouseParam param) {
-        // TODO: 10/10/2023 姝ゅ鍔犱簡鍞竴閿侊紝浼氬奖鍝嶆�ц兘锛屾�濊�冩槸鍚︽湁鏇村悎閫傜殑鍔炴硶
-        try {
-            Assert.notNull(param, "wareHouse param can not null !");
-            Assert.notNull(param.getWarehouseId(), "wareHouse id can not null");
-            List<CheckWarehouseResult> results;
-
-            String key = param.getWarehouseId().toString() + param.getModelId().toString();
-
-            /**
-             * 姝ゅ灏嗗悓涓�涓粨搴撲笅鐨勫悓涓�涓瀷鍙蜂笂閿侊紝涓嶅悓浠撳簱銆佷笉鍚屽瀷鍙蜂笉鍙楀奖鍝嶃��
-             */
-            synchronized (key) {
-                if (param.getIsCheckIn()) {
-                    results = new ArrayList<>();
-                    results.add(checkin(param));
-                } else {
-                    results = checkout(param);
-                }
-            }
-            return results;
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new RuntimeException(e.getMessage());
-        }
-
-    }
-
-    /**
-     * 鍦ㄧ敤鐗╁搧鍑哄簱
-     * @param param
-     * @return
-     */
-    private List<CheckUsingResult> checkUsingOut(CheckUsingParam param){
-
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	DEP_FORM_LENDING_MODEL a \n" +
-                "WHERE\n" +
-                "	a.BASE_GOODS_MODELS_ID =:MODEL_ID \n" +
-                "	AND DEP_FORM_LENDING_ID =:LENDING_ID \n" +
-                "	AND USING_COUNT > 0\n" +
-                "ORDER BY\n" +
-                "	PROCURE_DATE ASC PRICE DESC";
-
-        List<DepFormLendingModel>  modelsList = this.select(sql,new SqlParameter("MODEL_ID", param.getModel_id())
-                .put("LENDING_ID",param.getLending_id()),new DepFormLendingModel());
-
-        List<CheckUsingResult> resultList = new ArrayList<>();
-
-        int shengyu = param.getOutputCount();
-        for (DepFormLendingModel model : modelsList) {
-
-            CheckUsingResult result = new CheckUsingResult();
-
-            DepFormLendingGoods goods = get(new DepFormLendingGoods(),"id=?",new Object[]{model.getDepFormLendingGoodsId()});
-
-            //濡傛灉鏄疉绫荤墿鍝侊紝鍒欓渶瑕佷笌鎸佹湁浜虹瓑鍚�
-            if (goods.getClassification() == "A" && (goods.getGoodsUserName().equals(param.getUser_name()))) {
-                continue;
-            }
-
-            //濡傛灉褰撳墠鎸佹湁浜烘寔鏈夌墿鍝佹暟閲忓ぇ浜庡嚭搴撴暟閲忥紝鍒欑洿鎺ュ噺鎺夋暟閲忓嵆鍙��
-            if (model.getUsingCount() > shengyu){
-                result.setInitial_count(model.getUsingCount());
-                result.setLendingModel(model);
-                model.setUsingCount(model.getCounts() - param.getOutputCount());
-                result.setEnd_count(model.getUsingCount());
-                update(model);
-                resultList.add(result);
-
-                goods.setUsingCount(goods.getUsingCount() - param.getOutputCount());
-                update(goods);
-
-                return resultList;
-            }
-
-            shengyu = shengyu - model.getUsingCount();
-            goods.setUsingCount(goods.getUsingCount() - model.getUsingCount());
-
-            result.setInitial_count(model.getUsingCount());
-            result.setLendingModel(model);
-            model.setUsingCount(0);
-            result.setEnd_count(0);
-            update(model);
-            resultList.add(result);
-
-            update(goods);
-        }
-        return resultList;
-    }
-
-    /**
-     * 鍦ㄧ敤鐗╁搧鍏�
-     * @param param
-     * @return
-     */
-    private List<CheckUsingResult> checkUsingIn(CheckUsingParam param){
-
-        DepFormLending lending = get(new DepFormLending(),"id=?",new Object[]{param.getLending_id()});
-
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	DEP_FORM_LENDING_GOODS A \n" +
-                "WHERE\n" +
-                "	A.DEP_FORM_LENDING_ID = :LENDING_ID";
-
-        List<DepFormLendingGoods>  goodsList = this.select(sql,new SqlParameter()
-                .put("LENDING_ID",lending.getId()),new DepFormLendingGoods());
-
-        List<CheckUsingResult> resultList = new ArrayList<>();
-
-        for (DepFormLendingGoods goods : goodsList) {
-            for (CheckWarehouseResult output : param.getOutputList()) {
-                //濡傛灉鍑哄簱鐨勫瀷鍙蜂笌鍒嗗彂鍗曢噷鐨勫瀷鍙风浉鍚�
-                if (goods.getBaseGoodsModelsId().longValue() == output.getWhGoods().getBaseGoodsModelsId().longValue()){
-                    DepFormLendingModel model = new DepFormLendingModel();
-                    model.setId(IdUtil.generateId());
-                    model.setCounts(goods.getCounts());
-                    model.setDepFormLendingGoodsId(goods.getId());
-                    model.setDepFormLendingId(goods.getDepFormLendingId());
-                    model.setWhGoodsDetailsId(output.getWh_goods_detail_id());
-                    model.setNowUserName(goods.getGoodsUserName());
-                    model.setNowUserPhone(goods.getGoodsUserPhone());
-                    model.setWhGoodsId(output.getWhGoods().getId());
-                    //褰撳墠鍙娇鐢ㄦ暟閲�
-                    model.setUsingCount(model.getCounts());
-                    model.setWarehouseId(output.getWhGoods().getWarehouseId());
-                    model.setWarehouseName(output.getWhGoods().getWarehouseName());
-                    model.setAgencyId(lending.getAgencyId());
-                    model.setAgencyName(lending.getAgencyName());
-                    model.setDepartmentId(lending.getDepartmentId());
-                    model.setDepartmentName(lending.getDepartmentName());
-                    insert(model);
-
-                    CheckUsingResult result = new CheckUsingResult();
-                    result.setLendingModel(model);
-                    result.setInitial_count(0);
-                    result.setEnd_count(output.getInitial_count()-output.getEnd_count());
-                    resultList.add(result);
-                }
-            }
-        }
-
-        return resultList;
-    }
-
-    /**
-     * 鍑哄簱
-     */
-    private List<CheckWarehouseResult> checkout(BaseWarehouseParam param) {
-        //鏌ヨ鍑烘寚瀹氫粨搴撱�佹寚瀹氬瀷鍙凤紝鐘舵�佷负姝ｅ父鐨勭殑搴撳瓨鐗╁搧锛屾寜鐓ч噰璐椂闂村�掑彊銆佷环鏍煎�掑彊鎺掑垪
-       String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_GOODS \n" +
-                "WHERE\n" +
-                "	WAREHOUSE_ID =:WAREHOUSE_ID \n" +
-                "	AND BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID \n" +
-                "   AND STATES =1 \n" +
-                "   AND WH_COUNT > 0 \n" +
-                "  order by PROCURE_DATE asc PRICE DESC";
-        SqlParameter parameter = new SqlParameter();
-        parameter.add("WAREHOUSE_ID",param.getWarehouseId())
-                .add("BASE_GOODS_MODELS_ID",param.getModelId());
-        List<WhGoods> goodsList = select(sql,parameter,new WhGoods());
-        List<CheckWarehouseResult> resultList = new ArrayList<>();
-
-        int shengyu = param.getCount();
-
-        for (WhGoods goods : goodsList){
-            if (shengyu <= 0 ) break;
-
-            //濡傛灉搴撳瓨鏁伴噺澶т簬鍑哄簱鏁伴噺锛岀洿鎺ュ噺搴撳瓨
-            if (shengyu <= goods.getWhCount()){
-                shengyu = 0;
-
-                CheckWarehouseResult result = new CheckWarehouseResult();
-                result.setWhGoods(goods);
-                result.setInitial_count(goods.getWhCount());
-                goods.setWhCount(goods.getWhCount() - param.getCount());
-                result.setEnd_count(goods.getWhCount());
-                resultList.add(result);
-
-                //濡傛灉鍑忓簱瀛樺悗锛屽簱瀛樻暟涓�0锛屽垯鍙樻洿鐘舵�佷负宸插垹闄�
-                if (goods.getWhCount() == 0){
-                    goods.setStates(0);
-                }
-                update(goods);
-
-                //濡傛灉鏄皟鎷ㄥ嚭搴� 2:璋冩嫧锛�3锛氭姤搴�
-                if (param.getOutput_type() == 2 || param.getOutput_type() == 3){
-                    WhGoods nGoods = new WhGoods();
-                    BeanUtils.copyProperties(goods,nGoods);
-                    //鍙樻洿鐘舵�佷负璋冩嫧
-                    nGoods.setStates(param.getOutput_type());
-                    nGoods.setWhCount(param.getCount());
-                    nGoods.setId(IdUtil.generateId());
-                    insert(nGoods);
-
-                    CheckWarehouseResult nresult = new CheckWarehouseResult();
-                    nresult.setWhGoods(nGoods);
-                    nresult.setInitial_count(0);
-                    nresult.setEnd_count(nresult.getEnd_count());
-                    resultList.add(nresult);
-                }
-
-                return resultList;
-
-            }
-
-            //濡傛灉搴撳瓨鏁伴噺灏忎簬鍑哄簱鏁伴噺锛屽垯闇�瑕佸嚑涓簱瀛樼墿鍝佷竴璧峰嚭搴撱��
-
-            CheckWarehouseResult result = new CheckWarehouseResult();
-            result.setInitial_count(goods.getWhCount());
-            result.setEnd_count(0);
-            result.setWhGoods(goods);
-            resultList.add(result);
-
-            shengyu = param.getCount() - goods.getWhCount();
-            if (shengyu < 0){
-                throw new RuntimeException("鍑哄簱鏃讹紝璁＄畻閿欒");
-            }
-            goods.setWhCount(0);
-            goods.setStates(0);
-            update(goods);
-        }
-
-        throw new RuntimeException("鍑哄簱鏃讹紝璁＄畻閿欒");
-    }
-
-    private BaseWarehouse getWarehouse(long id){
-        BaseWarehouse w =  get(new BaseWarehouse(),"ID=?",new Object[]{id});
-        return w;
-    }
-
-    /**
-     * 鍏ュ簱
-     */
-    private CheckWarehouseResult checkin(BaseWarehouseParam param) throws RuntimeException {
-
-        //濡傛灉鏄噰璐叆搴�
-        if (param.getFirst_input_type() ==1){
-            WhFormProcureModel procureModel = get(new WhFormProcureModel(),"ID=?",new Object[]{param.getFirstInputCode()});
-            WhFormProcure procure = get(new WhFormProcure(),"ID=?",new Object[]{procureModel.getWhFormProcureId()});
-
-            WhGoods goods = new WhGoods();
-            goods.setId(IdUtil.generateId());
-            goods.setBaseGoodsTemplateId(procureModel.getBaseGoodsTemplateId());
-            goods.setGoodsTemplateName(procureModel.getGoodsTemplateName());
-            goods.setBaseGoodsModelsId(procureModel.getBaseGoodsModelsId());
-            goods.setBaseGoodsModelsName(procureModel.getBaseGoodsModelsName());
-            goods.setWhCount(procureModel.getCounts());
-            goods.setFirstInputCode(param.getFirstInputCode());
-            goods.setFirstInputType(param.getFirst_input_type());
-            goods.setFirstInputHisId(NumberGenerator.getLongSequenceNumber());
-            goods.setWarehouseId(procure.getWarehouseId());
-            goods.setWarehouseName(procure.getWarehouseName());
-            goods.setSupplier(procureModel.getSupplier());
-            goods.setUnit(procureModel.getUnit());
-            goods.setPrice(procureModel.getPrice());
-            goods.setProcureDate(procure.getIncomeTime());
-            goods.setBackDate(procure.getIncomeTime());
-            goods.setStates(1);
-            insert(goods);
-
-            CheckWarehouseResult result = new CheckWarehouseResult();
-            result.setWhGoods(goods);
-            result.setInitial_count(0);
-            result.setEnd_count(goods.getWhCount());
-            return result;
-        //闆舵槦鍏ュ簱
-        } else if (param.getFirst_input_type() ==2){
-
-            return null;
-
-        }
-
-        String sql = "SELECT\n" +
-                "	* \n" +
-                "FROM\n" +
-                "	WH_GOODS \n" +
-                "WHERE\n" +
-                "	WAREHOUSE_ID =:WAREHOUSE_ID \n" +
-                "	AND FIRST_INPUT_CODE =:FIRST_INPUT_CODE \n" +
-                "	AND BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID" +
-                "  order by PROCURE_DATE desc PRICE asc";
-        SqlParameter parameter = new SqlParameter();
-        parameter.add("WAREHOUSE_ID",param.getWarehouseId())
-                .add("FIRST_INPUT_CODE",param.getFirstInputCode())
-                .add("BASE_GOODS_MODELS_ID",param.getModelId());
-
-        List<WhGoods> goodsList = select(sql,parameter,new WhGoods());
-
-        if (goodsList == null || goodsList.size() == 0){
-           new RuntimeException("鏌ヤ笉鍒板巻鍙插簱瀛�");
-           return null;
-        }
-
-        for (WhGoods goods : goodsList){
-            CheckWarehouseResult result = new CheckWarehouseResult();
-            result.setWhGoods(goods);
-            result.setInitial_count(goods.getWhCount());
-            result.setEnd_count(goods.getWhCount() + param.getCount());
-
-            WhGoods newGoods = new WhGoods();
-            newGoods.setId(goods.getId());
-            newGoods.setWhCount(result.getEnd_count());
-            newGoods.setStates(1);
-            newGoods.setBackDate(DateUtil.getCurrentDateFor14());
-            this.update(newGoods);
-
-            return result;
-        }
-
-
-
-        return new CheckWarehouseResult();
-    }
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/data/Base_CategoryService.java b/consum-base/src/main/java/com/consum/base/core/data/Base_CategoryService.java
deleted file mode 100644
index d85228b..0000000
--- a/consum-base/src/main/java/com/consum/base/core/data/Base_CategoryService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.consum.base.core.data;
-
-import com.consum.model.po.BaseCategory;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class Base_CategoryService extends BaseServiceImpl {
-
-
-    public void addFirstCategory(long fid){
-        String[] classifications = new String[]{"A","B","C","A","B","C","A","B","C","A","B","C","A","B","C"};
-        for (int i=0;i<5;i++){
-            int j = 0;
-            j++;
-            if (j  == 4) {
-                j = 0;
-            }
-            BaseCategory category = new BaseCategory();
-            category.setId(NumberGenerator.getLongSequenceNumber());
-            category.setCategoryName("鐢靛瓙浜у搧"+i);
-            category.setLevels(1);
-            category.setFatherCategoryId(fid);
-            category.setClassification(classifications[j]);
-            category.setOrderNumber(j);
-            insert(category);
-        }
-    }
-
-    public void addSecondCategory(long firstid){
-
-        String sql = "select ID from base_category where LEVELS=1";
-
-        List<Map<String,Object>> list = select(sql,new HashMap<>());
-        for (Map map : list){
-
-            String[] classifications = new String[]{"A","B","C","A","B","C","A","B","C","A","B","C","A","B","C"};
-            for (int i=0;i<50;i++){
-                int j = 0;
-                j++;
-                if (j  == 4) {
-                    j = 0;
-                }
-                BaseCategory category = new BaseCategory();
-                category.setId(NumberGenerator.getLongSequenceNumber());
-                category.setCategoryName("鎵嬫満"+i);
-                category.setLevels(2);
-                category.setFatherCategoryId(Long.valueOf(map.get("ID").toString()));
-                category.setClassification(classifications[j]);
-                category.setStates(1);
-                category.setOrderNumber(j);
-                insert(category);
-            }
-        }
-    }
-
-    public void addThirdCategory(long secondid){
-        String sql = "select ID from base_category where LEVELS=2";
-
-        List<Map<String,Object>> list = select(sql,new HashMap<>());
-        for (Map map : list){
-
-            String[] classifications = new String[]{"A","B","C","A","B","C","A","B","C","A","B","C","A","B","C"};
-            for (int i=0;i<50;i++){
-                int j = 0;
-                j++;
-                if (j  == 4) {
-                    j = 0;
-                }
-                BaseCategory category = new BaseCategory();
-                category.setId(NumberGenerator.getLongSequenceNumber());
-                category.setCategoryName("鎵嬫満"+i);
-                category.setLevels(3);
-                category.setFatherCategoryId(Long.valueOf(map.get("ID").toString()));
-                category.setClassification(classifications[j]);
-                category.setStates(1);
-                category.setOrderNumber(j);
-                insert(category);
-            }
-        }
-    }
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/po/SYS_AGENCY.java b/consum-base/src/main/java/com/consum/base/core/po/SYS_AGENCY.java
deleted file mode 100644
index 9f8322a..0000000
--- a/consum-base/src/main/java/com/consum/base/core/po/SYS_AGENCY.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.consum.base.core.po;
-
-public class SYS_AGENCY {
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/po/WhFormInventory.java b/consum-base/src/main/java/com/consum/base/core/po/WhFormInventory.java
deleted file mode 100644
index c327856..0000000
--- a/consum-base/src/main/java/com/consum/base/core/po/WhFormInventory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.consum.base.core.po;
-
-/**
- * 鍔熻兘鎻忚堪: 鐩樼偣鍗�
- *
- * @author dhz
- * @date  2023-10-14 16:42
- * @version 1.0
- **/
-public class WhFormInventory {
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/po/WhFormProcure.java b/consum-base/src/main/java/com/consum/base/core/po/WhFormProcure.java
deleted file mode 100644
index ddef960..0000000
--- a/consum-base/src/main/java/com/consum/base/core/po/WhFormProcure.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.consum.base.core.po;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 閲囪喘鍗曘�怶H_FORM_PROCURE銆�
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class WhFormProcure {
-
-    private Long id;
-
-    private Long warehouseId;
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java b/consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java
deleted file mode 100644
index f2ff599..0000000
--- a/consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-//package com.consum.base.util;
-//
-//import com.consum.model.po.FinSysOrg;
-//import com.walker.infrastructure.tree.TreeNode;
-//import java.util.List;
-//
-///**
-// * @Description 鏈烘瀯鑺傜偣
-// * @Author wh
-// * @Date 2023/7/11 11:26
-// */
-//public class FinSysOrgUtils {
-//
-//    public FinSysOrgUtils() {
-//    }
-//
-//    public static final List<TreeNode> getFinSysOrgTree(List<FinSysOrg> finSysOrgList) {
-//        FinSysOrgTreeGenerator finSysOrgTreeGenerator = new FinSysOrgTreeGenerator((String)null);
-//        finSysOrgTreeGenerator.setEntityList(finSysOrgList);
-//        List<TreeNode> treeNodeList = finSysOrgTreeGenerator.getTreeRootList();
-//        return treeNodeList;
-//    }
-//}
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java
deleted file mode 100644
index 5fc9da2..0000000
--- a/consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.consum.base.core.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.crypto.codec.Hex;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 鍔熻兘鎻忚堪锛氳幏鍙栭殢鏈哄��
- *
- * @author dhz
- * @date 2023-10-16 11:20
- * @Version 1.0
- **/
-@Slf4j
-public class RandomUtil {
-
-    /**
-     * 鍔犵洂瀛楃涓�
-     */
-    private static final String SALT = "13";
-
-    /**
-     * 鑾峰彇鍒嗙粍搴忓彿
-     *
-     * @param id    鍒嗙粍涓氬姟涓婚敭id
-     * @param group 鍒嗙粍鏁� 浠�0寮�濮嬪埌 group-1 鍏眊roup 缁�
-     * @return 鍒嗙粍鏁�
-     */
-    public static Integer getRandom(Long id, Integer group) {
-        try {
-            MessageDigest md5 = MessageDigest.getInstance("md5");
-            byte[] digest = md5.digest((id + SALT).getBytes(StandardCharsets.UTF_8));
-            char[] encode = Hex.encode(digest);
-            Long parseLong = Long.parseLong(String.valueOf(encode).substring(0, 3), 16);
-            return (int) (parseLong % group);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
-        return -1;
-    }
-
-    public static void main(String[] args) {
-        Map<Integer, Integer> map = new HashMap<Integer, Integer>(2);
-        Integer group = 13;
-        long generateId = IdUtil.generateId();
-        for (int i = 0; i < 10000; i++) {
-            Integer random = RandomUtil.getRandom(generateId, group);
-            if (map.containsKey(random)) {
-                map.put(random, map.get(random) + 1);
-            } else {
-                map.put(random, 1);
-            }
-        }
-        System.out.println(map);
-    }
-}
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java
deleted file mode 100644
index 10e0cf9..0000000
--- a/consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java
+++ /dev/null
@@ -1,200 +0,0 @@
-//package com.consum.base.util;
-//
-//import com.consum.model.po.PTempProjectStageNode;
-//import com.walker.infrastructure.utils.CollectionUtils;
-//
-//import java.util.*;
-//
-///**
-// * @ClassName RangeMergeUtil
-//
-// * @Date 2023/9/25
-// * @Description
-// * @Version 1.0
-// **/
-//public class RangeMergeUtil {
-//
-//    /**
-//     * 鏍规嵁鑺傜偣涓妭鐐瑰紑濮嬫椂闂淬�佹寔缁椂闂达紝灏嗚妭鐐硅浆涓簂ink
-//     *
-//     * @param tempProjectStageNodes
-//     * @return
-//     */
-//    public static ArrayList<Link> tempNode2Link(List<PTempProjectStageNode> tempProjectStageNodes) {
-//        ArrayList<Link> links = new ArrayList<>();
-//        tempProjectStageNodes.forEach(item -> {
-//            Integer nodeTimeStart = item.getNodeTimeStart();
-//            Integer nodeTimeDays = item.getNodeTimeDays();
-//            if (nodeTimeStart != null && nodeTimeDays != null) {
-//                Link link = new Link(nodeTimeStart, nodeTimeStart + nodeTimeDays - 1);
-//                links.add(link);
-//            }
-//        });
-//        return links;
-//    }
-//
-//    /**
-//     * 瀵圭粰瀹氬尯闂磋繘琛屽悎骞�
-//     *
-//     * @param info_dict
-//     * @return
-//     */
-//    public static ArrayList<Link> merge(ArrayList<Link> info_dict) {
-//        //棣栧厛瀵筰nfo_dict杩涜鎺掑簭锛屾帓搴忚鍒欎负鏍规嵁Link鐨刲eft鎺掑簭锛屽鏋渓eft鐩哥瓑锛屾牴鎹畆ight鎺掑簭
-//        Collections.sort(info_dict, (o1, o2) -> {
-//            int a = o1.getLeft() - o2.getLeft();
-//            return a == 0 ? o1.getRight() - o2.getRight() : a;
-//        });
-//
-//        //鍒涘缓涓�涓敤浜庢帴鍙楀悎骞跺悗缁撴灉鐨刣ict,鍚屾椂璁剧疆涓�涓被浼兼粦鍔ㄧ獥鍙ｄ竴鏍风殑start鍜宔nd
-//        ArrayList<Link> result_dict = new ArrayList<>();
-//        double start = -2e9, end = -2e9;
-//        for (Link i : info_dict) {
-//            //鍒ゆ柇涓ょ鎯呭喌
-//            //绗竴绉嶆槸褰揺nd灏忎簬i.getLeft()鏃讹紝璇存槑鎴戜滑閬囧埌浜嗕竴涓柊鐨勬病鏈変氦闆嗙殑鍖洪棿
-//            //閭ｄ箞灏卞皢start鍜宔nd绉诲姩杩囨潵锛屽苟涓斿皢瀹冩坊鍔犲埌result_dict涓�
-//            if (end + 1 < i.getLeft()) {
-//                if (start != -2e9) {
-//                    result_dict.add(new Link((int) start, (int) end));
-//                }
-//                start = i.getLeft();
-//                end = i.getRight();
-//            }
-//            //绗簩绉嶆儏鍐垫槸褰撴湁浜ら泦鏃讹紝濡傛灉鍦ㄥ綋鍓嶆粦鍔ㄥ尯闂村唴锛屼笉鍙橈紝濡傛灉鍏秗ight澶т簬褰撳墠end锛屽皢婊戝姩鍖洪棿鐨別nd璁剧疆涓簉ight
-//            else {
-//                end = Math.max(end, i.getRight());
-//            }
-//        }
-//
-//        //鎺掔┖婊戝姩鍖洪棿
-//        if (start != -2e9) {
-//            result_dict.add(new Link((int) start, (int) end));
-//        }
-//        //杩斿洖result_dict涓尯闂寸殑涓暟
-//        return result_dict;
-//    }
-//
-//    /**
-//     * 鑾峰彇鑺傜偣鍏冪礌涓殑鏈�鍊间俊鎭�
-//     *
-//     * @param mergeList
-//     * @return
-//     */
-//    public static Map<String, Integer> getMergeMaxMinInfo(ArrayList<Link> mergeList) {
-//        if (CollectionUtils.isEmpty(mergeList)) {
-//            return null;
-//        }
-//        int maxLeft = Integer.MIN_VALUE;
-//        int minLeft = Integer.MAX_VALUE;
-//        int maxRight = Integer.MIN_VALUE;
-//        int minRight = Integer.MAX_VALUE;
-//
-//        for (Link link : mergeList) {
-//            int left = link.getLeft();
-//            int right = link.getRight();
-//            maxLeft = Math.max(maxLeft, left);
-//            minLeft = Math.min(minLeft, left);
-//            maxRight = Math.max(maxRight, right);
-//            minRight = Math.min(minRight, right);
-//        }
-//        HashMap<String, Integer> rtnInfo = new HashMap<>();
-//        rtnInfo.put("maxLeft", maxLeft);
-//        rtnInfo.put("minLeft", minLeft);
-//        rtnInfo.put("maxRight", maxRight);
-//        rtnInfo.put("minRight", minRight);
-//        return rtnInfo;
-//    }
-//
-//    /**
-//     * 鏍￠獙鏄惁鏈夋棩鏈熺┖妗ｅ苟杩斿洖鍖洪棿鏈�鍊间俊鎭�
-//     * @param tempProjectStageNodes
-//     * @return
-//     */
-//    public static Map<String, Integer> checkDateGap(List<PTempProjectStageNode> tempProjectStageNodes) {
-//        ArrayList<Link> info_dict = tempNode2Link(tempProjectStageNodes);
-//        ArrayList<Link> mergeList = merge(info_dict);
-//        if (mergeList.size() > 1) {
-//            return null;
-//        }
-//        return getMergeMaxMinInfo(mergeList);
-//    }
-//
-//    /**
-//     * 鏍￠獙鏄惁鏈夐噸鍙�
-//     * @param list
-//     * @return
-//     */
-//    public static Boolean checkOverlap(List<Map<String, Integer>> list) {
-//        for (int i = 0; i < list.size(); i++) {
-//            Integer minLeft1 = list.get(i).get("minLeft");
-//            Integer maxRight1 = list.get(i).get("maxRight");
-//            for (int j = i + 1; j < list.size(); j++) {
-//                Integer minLeft2 = list.get(j).get("minLeft");
-//                Integer maxRight2 = list.get(j).get("maxRight");
-//                if (minLeft1 <= maxRight2 && maxRight1 >= minLeft2) {
-//                    return true;
-//                }
-//            }
-//        }
-//        return false;
-//    }
-//
-//    public static void main(String[] args) {
-//        List<PTempProjectStageNode> tempProjectStageNodes = new ArrayList<>();
-//        PTempProjectStageNode node1 = new PTempProjectStageNode();
-//        node1.setNodeTimeStart(2);
-//        node1.setNodeTimeDays(1);
-//        tempProjectStageNodes.add(node1);
-//
-//        PTempProjectStageNode node2 = new PTempProjectStageNode();
-//        node2.setNodeTimeStart(1);
-//        node2.setNodeTimeDays(5);
-//        tempProjectStageNodes.add(node2);
-//
-//        PTempProjectStageNode node3 = new PTempProjectStageNode();
-//        node3.setNodeTimeStart(3);
-//        node3.setNodeTimeDays(6);
-//        tempProjectStageNodes.add(node3);
-//
-//        PTempProjectStageNode node4 = new PTempProjectStageNode();
-//        node4.setNodeTimeStart(80);
-//        node4.setNodeTimeDays(6);
-//        tempProjectStageNodes.add(node4);
-//
-//        ArrayList<Link> info_dict = tempNode2Link(tempProjectStageNodes);
-//        ArrayList<Link> mergeList = merge(info_dict);
-//        System.out.println("鍚堝苟鍚庡尯闂存暟閲忎负锛�" + mergeList.size());
-//        Map<String, Integer> mergeMaxMinInfo = getMergeMaxMinInfo(mergeList);
-//        System.out.println("鍚堝苟鍚庡尯闂翠腑left:Max鐨勫�间负:" + mergeMaxMinInfo.get("maxLeft"));
-//        System.out.println("鍚堝苟鍚庡尯闂翠腑left:Min鐨勫�间负:" + mergeMaxMinInfo.get("minLeft"));
-//        System.out.println("鍚堝苟鍚庡尯闂翠腑right:Max鐨勫�间负:" + mergeMaxMinInfo.get("maxRight"));
-//        System.out.println("鍚堝苟鍚庡尯闂翠腑right:Min鐨勫�间负:" + mergeMaxMinInfo.get("minRight"));
-//
-//    }
-//}
-//
-//class Link {
-//    private int left;
-//    private int right;
-//
-//    public int getLeft() {
-//        return left;
-//    }
-//
-//    public void setLeft(int left) {
-//        this.left = left;
-//    }
-//
-//    public int getRight() {
-//        return right;
-//    }
-//
-//    public void setRight(int right) {
-//        this.right = right;
-//    }
-//
-//    public Link(int left, int right) {
-//        this.left = left;
-//        this.right = right;
-//    }
-//}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java b/consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java
index c35e9bd..9b238e7 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/FinSysServerVo.java
@@ -3,130 +3,7 @@
 import java.util.List;
 
 public class FinSysServerVo {
-//    // 涓婚敭
-//    private Long id = null;
-//    // 灞炴�у垪琛�
-//   // private Long createTime = null;
-//    private Long createdTime = null;
-//   // private String createUser = null;
-//   private String createdBy = null;
-//    private String name = null;
-//    private String code = null;
-//    //private Integer level = null;
-//    private Integer lvType=null;
-//    private Long lv = null;
-//    private Long status = null;
-//    private Long delFlag = null;
-//    private Long parentId = null;
-//    private List<FinSysServerVo> children=null;
-//
-//    public FinSysServerVo() {
-//    }
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public Long getCreatedTime() {
-//        return createdTime;
-//    }
-//
-//    public void setCreatedTime(Long createdTime) {
-//        this.createdTime = createdTime;
-//    }
-//
-//    public String getCreatedBy() {
-//        return createdBy;
-//    }
-//
-//    public void setCreatedBy(String createdBy) {
-//        this.createdBy = createdBy;
-//    }
-//
-//    public String getName() {
-//        return name;
-//    }
-//
-//    public void setName(String name) {
-//        this.name = name;
-//    }
-//
-//    public String getCode() {
-//        return code;
-//    }
-//
-//    public void setCode(String code) {
-//        this.code = code;
-//    }
-//
-//    public Integer getLvType() {
-//        return lvType;
-//    }
-//
-//    public void setLvType(Integer lvType) {
-//        this.lvType = lvType;
-//    }
-//
-//    public Long getLv() {
-//        return lv;
-//    }
-//
-//    public void setLv(Long lv) {
-//        this.lv = lv;
-//    }
-//
-//    public Long getStatus() {
-//        return status;
-//    }
-//
-//    public void setStatus(Long status) {
-//        this.status = status;
-//    }
-//
-//    public Long getDelFlag() {
-//        return delFlag;
-//    }
-//
-//    public void setDelFlag(Long delFlag) {
-//        this.delFlag = delFlag;
-//    }
-//
-//    public Long getParentId() {
-//        return parentId;
-//    }
-//
-//    public void setParentId(Long parentId) {
-//        this.parentId = parentId;
-//    }
-//
-//    public List<FinSysServerVo> getChildren() {
-//        return children;
-//    }
-//
-//    public void setChildren(List<FinSysServerVo> children) {
-//        this.children = children;
-//    }
-//
-//    @Override
-//    public String toString() {
-//        return "FinSysCategoryVo{" +
-//                "id=" + id +
-//                ", createdTime=" + createdTime +
-//                ", createdBy='" + createdBy + '\'' +
-//                ", name='" + name + '\'' +
-//                ", code='" + code + '\'' +
-//                ", lvType=" + lvType +
-//                ", lv=" + lv +
-//                ", status=" + status +
-//                ", delFlag=" + delFlag +
-//                ", parentId=" + parentId +
-//                ", children=" + children +
-//                '}';
-//    }
+
     private Long id;
     private String label;
     private Long parentId;
@@ -139,8 +16,7 @@
         this.children = children;
     }
 
-    public FinSysServerVo() {
-    }
+    public FinSysServerVo() {}
 
     public Long getId() {
         return id;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java b/consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java
new file mode 100644
index 0000000..0b4c693
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/ImportUserParam.java
@@ -0,0 +1,31 @@
+package com.consum.base.pojo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 瀵煎叆鐢ㄦ埛鍙傛暟
+ * @date 2023/12/6 11:00
+ */
+@Data
+public class ImportUserParam {
+
+    @ExcelProperty("鐢ㄦ埛濮撳悕")
+    private String userName;
+    @ExcelProperty("鐢ㄦ埛缂栧彿")
+    private String userCode;
+    @ExcelProperty("鎵嬫満鍙�")
+    private String userPhone;
+    @ExcelProperty("鎬у埆(1鐢凤紝2濂�)")
+    private Integer sex;
+    @ExcelProperty("鐢靛瓙閭")
+    private String email;
+    @ExcelProperty("椤哄簭鍙�")
+    private Long seq;
+    @ExcelProperty("瑙掕壊鍚嶇О")
+    private String roleName;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormInventoryVo.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormInventoryVo.java
deleted file mode 100644
index e165303..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormInventoryVo.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.consum.base.pojo;
-
-public class LWhFormInventoryVo{
-    /**
-     * 浠撳簱鍚嶇О
-     */
-    private String warehouseName;
-    /**
-     * 鐗╁搧鍚嶇О
-     */
-    private String goodsTemplateName;
-    /**
-     * 瑙勬牸鍨嬪彿鍚嶇О
-     */
-    private String baseGoodsModelsName;
-    /**
-     * 绫诲瀷(鍑哄叆搴撶被鍨�) 2=鐩樼泩锛�3=鐩樹簭
-     */
-    private Integer inventoryResult;
-    /**
-     * 搴撳瓨鏁伴噺
-     */
-    private Integer initCounts;
-    /**
-     * 鐩樼偣鏁伴噺
-     */
-    private Integer inventoryCounts;
-    /**
-     * 宸紓鏁伴噺
-     */
-    private Integer errorCounts;
-    /**
-     * 鏈烘瀯鍚嶇О
-     */
-    private String agencyName;
-    /**
-     * 鎿嶄綔浜�
-     */
-    private String operatorName;
-    /**
-     * 缁撴潫鏃堕棿
-     */
-    private Long stopTime;
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getGoodsTemplateName() {
-        return goodsTemplateName;
-    }
-
-    public void setGoodsTemplateName(String goodsTemplateName) {
-        this.goodsTemplateName = goodsTemplateName;
-    }
-
-    public String getBaseGoodsModelsName() {
-        return baseGoodsModelsName;
-    }
-
-    public void setBaseGoodsModelsName(String baseGoodsModelsName) {
-        this.baseGoodsModelsName = baseGoodsModelsName;
-    }
-
-    public Integer getInventoryResult() {
-        return inventoryResult;
-    }
-
-    public void setInventoryResult(Integer inventoryResult) {
-        this.inventoryResult = inventoryResult;
-    }
-
-    public Integer getInitCounts() {
-        return initCounts;
-    }
-
-    public void setInitCounts(Integer initCounts) {
-        this.initCounts = initCounts;
-    }
-
-    public Integer getInventoryCounts() {
-        return inventoryCounts;
-    }
-
-    public void setInventoryCounts(Integer inventoryCounts) {
-        this.inventoryCounts = inventoryCounts;
-    }
-
-    public Integer getErrorCounts() {
-        return errorCounts;
-    }
-
-    public void setErrorCounts(Integer errorCounts) {
-        this.errorCounts = errorCounts;
-    }
-
-    public String getAgencyName() {
-        return agencyName;
-    }
-
-    public void setAgencyName(String agencyName) {
-        this.agencyName = agencyName;
-    }
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-
-    public Long getStopTime() {
-        return stopTime;
-    }
-
-    public void setStopTime(Long stopTime) {
-        this.stopTime = stopTime;
-    }
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/UpdatePwdParam.java b/consum-base/src/main/java/com/consum/base/pojo/UpdatePwdParam.java
deleted file mode 100644
index 003fd21..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/UpdatePwdParam.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.consum.base.pojo;
-
-import com.walker.web.param.ParamRequest;
-
-public class UpdatePwdParam extends ParamRequest {
-
-    private String newPwd;
-
-    private String newPwdCopy;
-
-    public String getNewPwd() {
-        return newPwd;
-    }
-
-    public void setNewPwd(String newPwd) {
-        this.newPwd = newPwd;
-    }
-
-    public String getNewPwdCopy() {
-        return newPwdCopy;
-    }
-
-    public void setNewPwdCopy(String newPwdCopy) {
-        this.newPwdCopy = newPwdCopy;
-    }
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java b/consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java
new file mode 100644
index 0000000..a6fc257
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/dto/GoodModelInfoDTO.java
@@ -0,0 +1,23 @@
+package com.consum.base.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鐗╁搧鍨嬪彿杞崲
+ * @date 2023/12/6 10:12
+ */
+@Data
+public class GoodModelInfoDTO {
+
+    private Long id;
+    private Long categoryId;
+    private String categoryName;
+    private Long baseGoodsTemplateId;
+    private String baseGoodsName;
+    private String baseGoodsModelsName;
+    private String unit;
+    private Integer counts;
+    private Integer totalAmount;
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
deleted file mode 100644
index 225fac6..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.consum.base.pojo.excel;
-
-import lombok.Data;
-
-/**
- * @author asus
- * @version 1.0
- * @description: 瀵煎嚭杞崲瀵硅薄
- * @date 2023/11/27 15:31
- */
-@Data
-public class TemplateExcelExport {
-
-
-    private String businessFormCode;
-
-    private String tenantName;
-
-    private String goodsName;
-
-    private String goodsModeName;
-
-    private Integer num;
-
-    private Integer totalAmount;
-
-    private String remark;
-
-    private int price;
-
-    private String warehouseName;
-
-    private Long createTime;
-
-    private String operatorName;
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
deleted file mode 100644
index 8b2a64c..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.consum.base.pojo.excel;
-
-import lombok.Data;
-
-/**
- * @author asus
- * @version 1.0
- * @description: TODO
- * @date 2023/11/29 15:21
- */
-@Data
-public class TemplateExcelTransfer {
-
-    private String businessFormCode;
-    private String operatorName;
-    private Long createTime;
-    private String inAgencyName;
-    private String outAgencyName;
-    private String tenantName;
-    private String goodsName;
-    private String baseGoodsModelsName;
-    private Integer num;
-    private Integer price;
-    private Integer totalAmount;
-    private String remark;
-}
\ No newline at end of file
diff --git a/consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java b/consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java
index 6c4cc70..843c2b8 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/query/UsingFormBackQry.java
@@ -1,5 +1,7 @@
 package com.consum.base.pojo.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +14,7 @@
  */
 @Data
 @ApiModel
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UsingFormBackQry {
 
     @ApiModelProperty(value = "涓婚敭")
diff --git a/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java b/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java
index b794736..149982a 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackParam.java
@@ -1,8 +1,11 @@
 package com.consum.base.pojo.request;
 
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,6 +18,7 @@
 @NoArgsConstructor
 @Data
 @ApiModel
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UsingFormBackParam {
 
     @ApiModelProperty(value = "鐗╁搧閫�鍥為儴闂╥d")
@@ -36,10 +40,5 @@
 
     @ApiModelProperty(value = "鍒嗗彂鐗╁搧淇℃伅")
     private List<UsingFormBackGoodsInfo> goods;
-
-
-
-
-
 
 }
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FromProcureTemplateInfoVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FromProcureTemplateInfoVO.java
deleted file mode 100644
index 2e330ed..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/response/FromProcureTemplateInfoVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.consum.base.pojo.response;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * @author asus
- * @version 1.0
- * @description: TODO
- * @date 2023/11/10 11:37
- */
-@ApiModel
-@Data
-public class FromProcureTemplateInfoVO {
-
-    private Long id;
-    private Long baseCategoryId;
-    private Long baseGoodsTemplateId;
-    private String goodsTemplateName;
-    private Object count;
-
-
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
index dca8aaf..fb62a92 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
@@ -1,6 +1,8 @@
 package com.consum.base.pojo.response;
 
 import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,15 +14,20 @@
 @Data
 public class GoodsModelVO {
 
+    @ApiModelProperty(value = "id")
     private Long id;
+    @ApiModelProperty(value = "鍨嬪彿鍚嶇О")
     private String baseGoodsModelsName;
+    @ApiModelProperty(value = "鍗曚綅淇℃伅")
     private String unit;
+    @ApiModelProperty(value = "鍗曚环")
     private Long price;
+    @ApiModelProperty(value = "鏁伴噺")
     private Integer counts;
     private Integer worehouseCount;
     private Long baseGoodsModelsId;
+    @ApiModelProperty(value = "鎬婚噾棰�")
     private Integer totalAmount;
-
 
     private String scrappedName;
 
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
index 870c059..4469590 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
@@ -1,5 +1,6 @@
 package com.consum.base.service;
 
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
 import java.util.List;
 import java.util.Map;
 
@@ -31,4 +32,12 @@
      * @return
      */
     List<GoodsTemplateCountVO> getProcureCountByBusinessId(Long businessId);
+
+    /**
+     * 鏍规嵁涓氬姟id鏌ヨ鍨嬪彿淇℃伅鍒楄〃
+     *
+     * @param businessId
+     * @return
+     */
+    List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId);
 }
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
similarity index 96%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
index f0b40e6..16d53b6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,6 +17,15 @@
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.utils.IdUtil;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
+import com.consum.base.service.LWhFormInventoryService;
+import com.consum.base.service.LWhFormOutputService;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
 import com.consum.model.po.BaseWarehouse;
 import com.consum.model.po.FinSysTenantUser;
 import com.consum.model.po.LWhFormInventory;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 63d68bb..fab2164 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.consum.base.service.BaseWarehouseService;
 import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormInventoryCoreService;
 import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
 import com.consum.base.service.LWhFormInventoryService;
 import com.consum.base.service.LWhGoodsService;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
index 4f72f9f..624d04b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
@@ -1,6 +1,5 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
 
-import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +17,12 @@
 import com.consum.base.core.service.LWhWarningCoreServiceImpl;
 import com.consum.base.core.utils.IdUtil;
 import com.consum.base.core.utils.LockManage;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormOutputService;
+import com.consum.base.service.LWhGoodsRecordService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
 import com.consum.model.po.LWarehouseFlow;
 import com.consum.model.po.LWhFormOutput;
 import com.consum.model.po.LWhFormTransfer;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index f686ae5..f7ea0eb 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -28,7 +28,6 @@
 import com.consum.base.pojo.query.LWhFormOutputQry;
 import com.consum.base.service.BaseGoodsModelsService;
 import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormOutputCoreService;
 import com.consum.base.service.LWhFormOutputService;
 import com.consum.base.service.LWhGoodsService;
 import com.consum.base.service.LWhProcureModelService;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
similarity index 95%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
index 457b15c..f01351b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
@@ -1,5 +1,8 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
 
+import com.consum.base.service.LWarehouseFlowCoreService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhProcureModelService;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
index d7ffb63..61a10c7 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
@@ -4,7 +4,6 @@
 import com.consum.base.service.LGoodsUserRecordServiceImpl;
 import com.consum.base.service.LGoodsWhRecordServiceImpl;
 import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhFormOutputCoreService;
 import com.consum.base.service.LWhFormTransferService;
 import com.consum.base.service.LWhGoodsRecordService;
 import com.consum.base.service.LWhGoodsService;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java
index e2564bd..64bc8de 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelServiceImpl.java
@@ -10,6 +10,7 @@
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
 import com.consum.base.pojo.response.GoodsTemplateCountVO;
 import com.consum.base.service.LWhProcureModelService;
 import com.consum.model.po.LWhProcureModel;
@@ -137,4 +138,23 @@
         }
         return goodsTemplateCount;
     }
+
+    @Override
+    public List<GoodModelInfoDTO> getGoodsModelListByBusinessId(Long businessId) {
+        // 鏌ヨ鍨嬪彿鍒楄〃淇℃伅
+        List<GoodModelInfoDTO> goodsModelList = Lists.newArrayList();
+        String sql =
+            "SELECT bgt.id baseGoodsTemplateId,pm.id,CATEGORY_ID,CATEGORY_NAME,GOODS_NAME baseGoodsName,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+                + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+                + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+                + "WHERE pm.BUSINESS_ID = :businessId";
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("businessId", businessId);
+        List<Map<String, Object>> modelList = select(sql, paramMap, new MapperUtil());
+        modelList.forEach(item -> {
+            GoodModelInfoDTO goodsModelVO = MapUtils.convertMapToObj(item, GoodModelInfoDTO.class);
+            goodsModelList.add(goodsModelVO);
+        });
+        return goodsModelList;
+    }
 }
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
index bfc5d76..01c39c7 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/FinSysTenantUser.java
@@ -1,17 +1,19 @@
 
 package com.consum.model.po;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.walker.jdbc.BasePo;
-
-import java.util.List;
 
 /**
  * 琛ㄥ悕:FIN_SYS_TENANT_USER *
  *
  * @author genrator
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 public class FinSysTenantUser extends BasePo<FinSysTenantUser> {
     // 搴忓垪鍖栫増鏈彿

--
Gitblit v1.9.1