From c3324e194441e601d474601bd0f7ac62c120c486 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 16:17:28 +0800
Subject: [PATCH] 出库fix
---
/dev/null | 49 ------
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java | 43 ++---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 21 +-
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 15 +
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 33 ++-
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 52 ++++--
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 32 ++-
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 38 ++--
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 4
consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsModelParam.java | 33 ++++
consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsParam.java | 40 +++++
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 94 +++++------
12 files changed, 250 insertions(+), 204 deletions(-)
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 a4b1079..c54ba7f 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
@@ -1,30 +1,39 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.*;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.LWhFormOutputExtend;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.service.LWhFormOutputServiceImpl;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.*;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
/**
* @Description 鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+@Api(value = "鍑哄簱鍗�", tags = "鍑哄簱鍗�")
@RestController
@RequestMapping("/pc/l/wh/form/output")
public class LWhFormOutputController extends BaseController {
@@ -41,22 +50,30 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+ @ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
+// @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam")
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormOutputInsertParam param) {
+ public ResponseValue add() {
+ LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- int result = this.lWhFormOutputService.add(param, currentUser,this.getSysInfo());
- if (result > 0) return ResponseValue.success(1);
+ int result = this.lWhFormOutputService.add(param, currentUser, this.getSysInfo());
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
* @Description 鍒楄〃鏌ヨ
*/
+ @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam")
@GetMapping("/list")
- public ResponseValue queryFormOutputList(LWhFormOutputParam param) {
+ public ResponseValue queryFormOutputList() {
+ LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -116,23 +133,18 @@
}
/**
- * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
+ * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
@GetMapping("/select/number")
- public ResponseValue selectNumber(Long warehouseId,Long baseGoodsModelsId) {
+ public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) {
if (warehouseId == null || baseGoodsModelsId == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1,null);
+ int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
return ResponseValue.success(num);
}
-
-
-
-
-
}
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 425a67f..a3a2f81 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
@@ -224,7 +224,9 @@
* @Description 鍒楄〃鏌ヨ
*/
@ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+ })
@GetMapping("/list")
public ResponseValue queryFormProcureList(FormProcureQryDto param) {
S_user_core currentUser = this.getCurrentUser();
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsModelParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsModelParam.java
new file mode 100644
index 0000000..1505609
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsModelParam.java
@@ -0,0 +1,33 @@
+package com.consum.base.pojo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鍑哄簱鐗╁搧鍨嬪彿
+ * @date 2023/11/13 11:29
+ */
+@Data
+@ApiModel(value = "鍑哄簱鐗╁搧鍨嬪彿")
+public class LWFormsOutputGoodsModelParam {
+
+ //瑙勬牸鍨嬪彿缂栧彿
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿缂栧彿")
+ private Long baseGoodsModelsId;
+ // 璁￠噺鍗曚綅
+ @ApiModelProperty(value = "璁￠噺鍗曚綅")
+ private String baseUnit;
+ //搴撳瓨鏁伴噺
+ @ApiModelProperty(value = "搴撳瓨鏁伴噺")
+ private Long warehouseNum;
+ //鏁伴噺
+ @ApiModelProperty(value = "鎿嶄綔鏁伴噺")
+ private Integer counts;
+
+ @ApiModelProperty(value = "閲囪喘绫诲瀷")
+ private Integer procureModelBusinessType;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsParam.java
new file mode 100644
index 0000000..cf9861f
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWFormsOutputGoodsParam.java
@@ -0,0 +1,40 @@
+package com.consum.base.pojo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+@ApiModel(value = "璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�")
+@Data
+public class LWFormsOutputGoodsParam {
+
+
+ /**
+ * 鐗╁搧id
+ */
+ @ApiModelProperty(value = "鐗╁搧id")
+ private Long baseGoodsTemplateId;
+ /**
+ * 鐗╁搧妯＄増鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╁搧妯＄増鍚嶇О")
+ private String goodsTemplateName;
+
+ /**
+ * 鍒嗙被id
+ */
+ @ApiModelProperty(value = "鍒嗙被id")
+ private Long baseCategoryId;
+
+ /**
+ * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
+ */
+ private List<LWFormsOutputGoodsModelParam> models;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java
deleted file mode 100644
index 9ef8062..0000000
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputGoodsParams.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.consum.base.pojo;
-
-import com.walker.web.param.ParamRequest;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
-public class LWhFormOutputGoodsParams extends ParamRequest {
- /**
- * 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
- */
- private List<LWhProcureModelParams> models;
- /**
- * 鐗╁搧id
- */
- private Long baseGoodsTemplateId;
- /**
- * 鐗╁搧妯＄増鍚嶇О
- */
- private String goodsTemplateName;
-
- public List<LWhProcureModelParams> getModels() {
- return models;
- }
-
- public void setModels(List<LWhProcureModelParams> models) {
- this.models = models;
- }
-
- public Long getBaseGoodsTemplateId() {
- return baseGoodsTemplateId;
- }
-
- public void setBaseGoodsTemplateId(Long baseGoodsTemplateId) {
- this.baseGoodsTemplateId = baseGoodsTemplateId;
- }
-
- public String getGoodsTemplateName() {
- return goodsTemplateName;
- }
-
- public void setGoodsTemplateName(String goodsTemplateName) {
- this.goodsTemplateName = goodsTemplateName;
- }
-}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java
index 8a0f422..7e1135b 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputInsertParam.java
@@ -1,51 +1,40 @@
package com.consum.base.pojo;
import com.walker.web.param.ParamRequest;
-
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.util.List;
+import lombok.Data;
/**
- * @Description 鏂板鍑哄簱鍗曞弬鏁�
+ * @Description 鏂板鍑哄簱鍗曞弬鏁�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+@ApiModel(value = "LWhFormOutputInsertParam")
+@Data
public class LWhFormOutputInsertParam extends ParamRequest {
+
/**
* 浠撳簱id
*/
+ @ApiModelProperty(value = "浠撳簱id")
private Long warehouseId;
/**
* 鍑哄簱鏃堕棿
*/
+ @ApiModelProperty(value = "鍑哄簱鏃堕棿")
private Long dealTime;
+ /**
+ * 鍑哄簱鎵嬬画
+ */
+ @ApiModelProperty(value = "鍑哄簱鎵嬬画")
+ private String procureDoc;
/**
* 璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�
*/
- private List<LWhFormOutputGoodsParams> goods;
+ @ApiModelProperty(value = "璁板綍鐗╁搧淇℃伅鍜岃鏍煎瀷鍙�")
+ private List<LWFormsOutputGoodsParam> goods;
-
- public Long getWarehouseId() {
- return warehouseId;
- }
-
- public void setWarehouseId(Long warehouseId) {
- this.warehouseId = warehouseId;
- }
-
- public Long getDealTime() {
- return dealTime;
- }
-
- public void setDealTime(Long dealTime) {
- this.dealTime = dealTime;
- }
-
- public List<LWhFormOutputGoodsParams> getGoods() {
- return goods;
- }
-
- public void setGoods(List<LWhFormOutputGoodsParams> goods) {
- this.goods = goods;
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
index 70332ee..094eb08 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
@@ -6,14 +6,13 @@
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @ClassName LGoodsUserRecordCoreService
@@ -24,6 +23,7 @@
@Service
@Transactional(rollbackFor = Exception.class)
public class LGoodsUserRecordCoreService {
+
@Resource
private GoodsBaseServiceImpl goodsBaseService;
@Resource
@@ -54,7 +54,7 @@
Long inWarehouseId = whFormTransfer.getInWarehouseId();
// 灏嗘墍鏈夌墿鍝佽缃负鏈垎鍙�
List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, null, null, null);
- lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, (short) 3);
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 璁剧疆鏃х殑LAST_RECORD= 0
lGoodsUserRecordService.updSetNotLast(srappedGoodsIds);
//鎻掑叆鏂扮殑
@@ -71,7 +71,8 @@
//閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
- List<Long> toUserGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, baseGoodsModelsId, (short) 1, goodsNum);
+ List<Long> toUserGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId, transBusinessId, null, baseGoodsModelsId,
+ (short) 1, goodsNum);
if (CollectionUtils.isEmpty(toUserGoodsIds)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鎿嶄綔澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
@@ -90,7 +91,7 @@
tmp.setLastRecord(1);
goodsUserRecords.add(tmp);
}
- lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, (short) 2);
+ lWhGoodsService.modGoodsTransfering(toUserGoodsIds, null, null, null, 2);
lGoodsUserRecordService.insertBatch(goodsUserRecords);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index a870d09..c5e617f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -5,18 +5,21 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.List;
-import java.util.Map;
/**
* @ClassName WhFormOutputCoreService
@@ -40,13 +43,13 @@
@Autowired
public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- CodeGeneratorService codeGeneratorService,
- LWhProcureModelService lWhProcureModelService,
- LWhFormOutputService lWhFormOutputService,
- LWarehouseFlowService lWarehouseFlowService,
- LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordService) {
+ LWhGoodsService lWhGoodsService,
+ CodeGeneratorService codeGeneratorService,
+ LWhProcureModelService lWhProcureModelService,
+ LWhFormOutputService lWhFormOutputService,
+ LWarehouseFlowService lWarehouseFlowService,
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService) {
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.codeGeneratorService = codeGeneratorService;
@@ -181,7 +184,7 @@
short queryModelStatusT = 1;
//閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
Short buyTypeT = null;
- Short modGoodsTransferingStatusT = null;
+ Integer modGoodsTransferingStatusT = null;
String outputCode = lWhFormOutput.getOutputCode();
if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
//璋冩嫧鍑哄簱
@@ -200,7 +203,7 @@
}
short queryModelStatus = queryModelStatusT;
Short buyType = buyTypeT;
- Short modGoodsTransferingStatus = modGoodsTransferingStatusT;
+ Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
@@ -252,7 +255,8 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
- List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
+ List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType,
+ goodsModelNum);
lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index d52b1d7..dd97fbc 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -3,21 +3,27 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.*;
import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
+import com.consum.base.pojo.LWFormsOutputGoodsParam;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @Description 鍑哄簱鍗�
@@ -42,7 +48,6 @@
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
-
// /**
// * @Description 鏂板鍑哄簱鍗�
@@ -175,11 +180,11 @@
return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWhFormOutputGoodsParams> goodsList = param.getGoods();
+ List<LWFormsOutputGoodsParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWhFormOutputGoodsParams goods : goodsList) {
- List<LWhProcureModelParams> models = goods.getModels();
- for (LWhProcureModelParams model : models) {
+ for (LWFormsOutputGoodsParam goods : goodsList) {
+ List<LWFormsOutputGoodsModelParam> models = goods.getModels();
+ for (LWFormsOutputGoodsModelParam model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
lWhProcureModel.setBusinessType(3);
@@ -192,7 +197,7 @@
}
lWhProcureModel.setCounts(model.getCounts());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
@@ -216,7 +221,7 @@
}
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -230,13 +235,14 @@
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
- sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ sql.append(
+ " AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
//鏈烘瀯
- if (param.getAgencyId() != null){
+ if (param.getAgencyId() != null) {
sql.append(" and AGENCY_ID like :agencyId ");
- paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
//鍒涘缓浜�
if (!StringUtils.isEmpty(param.getOperatorName())) {
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
index 28d8941..06a2a59 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
@@ -2,19 +2,21 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.LWhGoodsRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @ClassName LWhFormScrappedCoreService
@@ -25,6 +27,7 @@
@Service
@Slf4j
public class LWhFormScrappedCoreService {
+
private GoodsBaseServiceImpl goodsBaseService;
private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@@ -35,12 +38,12 @@
@Autowired
public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
- LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordService,
- LWarehouseFlowService lWarehouseFlowService) {
+ LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
+ BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ LWhGoodsService lWhGoodsService,
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService,
+ LWarehouseFlowService lWarehouseFlowService) {
// this.lWhFormScrappedService = lWhFormScrappedService;
this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
@@ -89,7 +92,8 @@
}
// 鎸夊瀷鍙峰垎缁�
- Map<Long, List<LWhFormScrappedGoods>> modelGroup = formScrappedGoods.stream().collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
+ Map<Long, List<LWhFormScrappedGoods>> modelGroup = formScrappedGoods.stream()
+ .collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
for (Map.Entry<Long, List<LWhFormScrappedGoods>> entry : modelGroup.entrySet()) {
//瑙勬牸鍨嬪彿缂栧彿
Long baseGoodsModelsId = entry.getKey();
@@ -135,7 +139,8 @@
//浣跨敤浜哄憳鍚嶇О
String userName = formScrappedGood.getUserName();
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
- srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId, (short) 2, counts);
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId,
+ (short) 2, counts);
}
if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
@@ -148,7 +153,7 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
// 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
- lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, (short) 3);
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
index aad0c77..105dc14 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -1,22 +1,26 @@
package com.consum.base.service;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LGoodsUserRecord;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhGoodsRecordDetails;
+import com.consum.model.po.LWhProcureModelUser;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* @ClassName LWhFormTransferCoreService
@@ -28,6 +32,7 @@
@Slf4j
@Transactional(rollbackFor = Exception.class)
public class LWhFormTransferCoreService {
+
@Resource
private LWhFormTransferServiceImpl lWhFormTransferService;
@Resource
@@ -120,7 +125,7 @@
//鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
Integer businessType = lWhFormTransfer.getBusinessType();
//鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
- short goodsStatus = 1;
+ Integer goodsStatus = 1;
//绫诲瀷0鍒嗗彂浣跨敤1 鍙嶅簱
Integer recordType = null;
if (businessType == 1) {
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index ea3b9ea..e53939c 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -1,15 +1,15 @@
package com.consum.base.service;
+import com.consum.model.po.LWhGoods;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
/**
* @ClassName LWhGoodsService
@@ -69,9 +69,10 @@
* @param goodsModelNum 鍙栧嚭鐨勬暟閲�
* @return
*/
- private static String QUERY_OUT_GOODS_ID = "SELECT*FROM L_WH_GOODS WHERE 1=1";
+ private static String QUERY_OUT_GOODS_ID = "SELECT * FROM L_WH_GOODS WHERE 1=1";
- public List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ public List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType,
+ Integer goodsModelNum) {
StringBuilder sql = new StringBuilder(QUERY_OUT_GOODS_ID);
Map<String, Object> paramts = new HashMap<>();
if (warehouseType != null) {
@@ -83,7 +84,7 @@
paramts.put("warehouseId", warehouseId);
}
if (baseGoodsModelsId != null) {
- sql.append(" and BASE_GOODS_TEMPLATE_ID=:baseGoodsModelsId");
+ sql.append(" and BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
}
if (states != null) {
@@ -94,7 +95,7 @@
sql.append(" and BUY_TYPE=:buyType");
paramts.put("buyType", buyType);
}
- return select(sql.append(" limit").append(goodsModelNum).toString(), paramts);
+ return select(sql.append(" limit ").append(goodsModelNum).toString(), paramts);
}
@@ -119,8 +120,7 @@
/**
- * 鏌ヨ鎶ュ簾鐗╁搧
- * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ * 鏌ヨ鎶ュ簾鐗╁搧 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
*
* @param warehouseType
* @param warehouseId
@@ -137,12 +137,12 @@
private static String QUERY_SCRAPPED_GOODS_END = " ORDER BY goods.PRICE DESC,goods.PROCURE_DATE ASC,goods.id";
public List<Map<String, Object>> queryScrappedGoods(Integer warehouseType,
- Long warehouseId,
- Long transBusinessId,
- String nowUserName,
- Long baseGoodsModelsId,
- Short states,
- Integer goodsModelNum) {
+ Long warehouseId,
+ Long transBusinessId,
+ String nowUserName,
+ Long baseGoodsModelsId,
+ Short states,
+ Integer goodsModelNum) {
if (warehouseType == null) {
warehouseType = 0;
}
@@ -180,8 +180,7 @@
}
/**
- * 鏌ヨ鎶ュ簾鐗╁搧
- * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ * 鏌ヨ鎶ュ簾鐗╁搧 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
*
* @param warehouseType
* @param warehouseId
@@ -193,13 +192,14 @@
* @return
*/
public List<Long> queryScrappedGoodsIds(Integer warehouseType,
- Long warehouseId,
- Long transBusinessId,
- String nowUserName,
- Long baseGoodsModelsId,
- Short states,
- Integer goodsModelNum) {
- List<Map<String, Object>> outGoods = queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, states, goodsModelNum);
+ Long warehouseId,
+ Long transBusinessId,
+ String nowUserName,
+ Long baseGoodsModelsId,
+ Short states,
+ Integer goodsModelNum) {
+ List<Map<String, Object>> outGoods = queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, states,
+ goodsModelNum);
if (CollectionUtils.isEmpty(outGoods)) {
return null;
}
@@ -216,31 +216,29 @@
* @param toWarehouseName
* @return
*/
- private static String MOD_GOODS_TRANSFERING_PREFIX = "update L_WH_GOODS set";
+ private static String MOD_GOODS_TRANSFERING_PREFIX = "update L_WH_GOODS set ";
- public int modGoodsTransfering(List<Long> whGoods, Integer warehouseType, Long toWarehouseId, String toWarehouseName, Short states) {
- StringBuilder sql = new StringBuilder(MOD_GOODS_TRANSFERING_PREFIX);
- ArrayList<Object> params = new ArrayList<>();
- if (toWarehouseId != null) {
- sql.append(", WAREHOUSE_TYPE=?");
- params.add(warehouseType);
- }
- if (toWarehouseId != null) {
- sql.append(", WAREHOUSE_ID=?");
- params.add(toWarehouseId);
- }
- if (toWarehouseName != null) {
- sql.append(", WAREHOUSE_NAME=?");
- params.add(toWarehouseName);
- }
- if (states != null) {
- sql.append(", STATES=?");
- params.add(states);
- }
- sql.deleteCharAt(22);
- sql.append(" where id in(?)");
- params.add(whGoods);
- return update(sql.toString(), params.toArray());
+ public int modGoodsTransfering(List<Long> whGoods, Integer warehouseType, Long toWarehouseId, String toWarehouseName, Integer states) {
+
+ List<LWhGoods> params = new ArrayList<>();
+ whGoods.stream().forEach(id -> {
+ LWhGoods lWhGoods = new LWhGoods();
+ lWhGoods.setId(id);
+ if (toWarehouseId != null) {
+ lWhGoods.setWarehouseType(warehouseType);
+ }
+ if (toWarehouseId != null) {
+ lWhGoods.setWarehouseId(toWarehouseId);
+ }
+ if (toWarehouseName != null) {
+ lWhGoods.setWarehouseName(toWarehouseName);
+ }
+ if (states != null) {
+ lWhGoods.setStates(states);
+ }
+ params.add(lWhGoods);
+ });
+ return updateBatch(params);
}
}
--
Gitblit v1.9.1