From edc87e2fc3760cd7d1230bc058acf5620ea2c465 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 15:03:15 +0800
Subject: [PATCH] 部门分发添加,分发单型号查询

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java |   58 ++++++++++++++--------------------------------------------
 1 files changed, 14 insertions(+), 44 deletions(-)

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 15235d3..e3879e3 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
@@ -7,63 +7,33 @@
 import com.consum.base.core.CodeGeneratorEnum;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.WhBusinessEnum;
-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.core.utils.*;
 import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
 import com.consum.base.pojo.LWhFormProcureParam;
 import com.consum.base.pojo.LWhProcureModelParam;
 import com.consum.base.pojo.excel.ProcureExcelTemplate;
 import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.FormProcureVO;
-import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormProcureExtendVO;
-import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.LOrgSupplierServiceImpl;
-import com.consum.base.service.LWhFormProcureCoreService;
-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.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LOrgSupplier;
-import com.consum.model.po.LWhFormProcure;
-import com.consum.model.po.LWhFormProcureGoods;
-import com.consum.model.po.LWhProcureModel;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
 import com.walker.web.ResponseValue;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * @ClassName LWhFormProcureController
@@ -126,7 +96,7 @@
         // 閲囪喘鍗昳d
         Long whFormProcureId = param.getId();
         if (whFormProcureId == null) {
-            whFormProcureId = NumberGenerator.getLongSequenceNumber();
+            whFormProcureId = IdUtil.generateId();
         }
         long procureTime = Long.valueOf(param.getProcureTime());
 
@@ -150,7 +120,7 @@
                 return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
             }
             LWhFormProcureGoods procureGood = new LWhFormProcureGoods();
-            long fromProcureGoodsId = NumberGenerator.getLongSequenceNumber();
+            long fromProcureGoodsId = IdUtil.generateId();
             procureGood.setId(fromProcureGoodsId);
             procureGood.setWhFormProcureId(whFormProcureId);
             procureGood.setBaseCategoryId(baseCategoryId);
@@ -181,7 +151,7 @@
                 // 鏌ヨ鍨嬪彿搴撳瓨
                 int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
                 LWhProcureModel model = new LWhProcureModel();
-                model.setId(NumberGenerator.getLongSequenceNumber());
+                model.setId(IdUtil.generateId());
                 model.setFromProcureGoodsId(fromProcureGoodsId);
                 model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
                 model.setBusinessId(whFormProcureId);
@@ -217,7 +187,7 @@
 
         supplierList.forEach(supplier -> {
             LOrgSupplier lOrgSupplier = new LOrgSupplier();
-            lOrgSupplier.setId(NumberGenerator.getLongSequenceNumber());
+            lOrgSupplier.setId(IdUtil.generateId());
             lOrgSupplier.setAgencyId(tenantId);
             lOrgSupplier.setAgencyName(tenantName);
             lOrgSupplier.setSupplier(supplier);

--
Gitblit v1.9.1