From 6d1fcbe98f3dc8f75ac3f7784152b5a04942a89f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 31 十月 2023 19:26:29 +0800
Subject: [PATCH] feat: 报废单报废
---
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java | 44 +-
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java | 36 +-
consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java | 48 ++--
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 7
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 192 ++++++++++++++++
consum-base/src/main/java/com/consum/base/core/util/LockManage.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 38 +--
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 5
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 6
consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java | 20 +
consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java | 46 +--
consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java | 42 +++
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java | 16 +
consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java | 22 +
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedService.java | 16 +
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 113 ++++++++
18 files changed, 528 insertions(+), 133 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 af38311..3b24f16 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
@@ -121,7 +121,7 @@
return ResponseValue.error("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
}
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setFromProcureGoodsId(fromProcureGoodsId);
diff --git a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
index 7328f04..3df3162 100644
--- a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
+++ b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
@@ -23,7 +23,11 @@
/**
* 4閮ㄩ棬鍒嗗彂
*/
- BUMENFENFA((short) 4);
+ BUMENFENFA((short) 4),
+ /**
+ * 鎶ュ簾
+ */
+ BAOFEI((short) 5);
private short value;
diff --git a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java b/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
index 8fcc9ef..ac6f8b8 100644
--- a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
+++ b/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
@@ -12,8 +12,8 @@
public class LockManage {
private static final ConcurrentHashMap<String, Object> lockMap = new ConcurrentHashMap<>();
- public static Object acquireLock(Long warehouseId, Long goodsModelsId) {
- String key = warehouseId + "-" + goodsModelsId;
+ public static Object acquireLock(int warehouseType, Long warehouseId, Long goodsModelsId) {
+ String key = warehouseType + "-" + warehouseId + "-" + goodsModelsId;
return lockMap.computeIfAbsent(key, k -> new Object());
}
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index 6f37d34..a45460e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
@@ -65,6 +65,7 @@
}
// 鏌ヨ浠撳簱淇℃伅
Long warehouseFlowId = warehouseFlow.getId();
+ Integer warehouseType = warehouseFlow.getWarehouseType();
Long warehouseId = warehouseFlow.getWarehouseId();
Long dealTime = warehouseFlow.getDealTime();
BaseWarehouse baseWarehouses = lWarehouseFlowService.get(new BaseWarehouse(warehouseId));
@@ -118,10 +119,10 @@
whGoodsRecord.setThisType(1);
//閫氳繃LockManage鑾峰緱閿�
- Object warehouseModelLockObj = LockManage.acquireLock(warehouseId, baseGoodsModelsId);
+ Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType,warehouseId, baseGoodsModelsId, (short) 1, null);
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setThisCount(modelCount);
whGoodsRecord.setEndCount(goodsModelNum + modelCount);
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 b0b9fad..9494cc6 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
@@ -10,12 +10,7 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcCall;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -33,8 +28,7 @@
@Slf4j
@Service
public class LWhFormOutputCoreService {
- private final JdbcTemplate jdbcTemplate;
- private SimpleJdbcCall simpleJdbcCall;
+
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private CodeGeneratorService codeGeneratorService;
@@ -42,6 +36,8 @@
private LWhFormTransferService lWhFormTransferService;
private LWhFormOutputService lWhFormOutputService;
private LWarehouseFlowService lWarehouseFlowService;
+ private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
+ private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
@@ -51,8 +47,8 @@
LWhFormTransferService lWhFormTransferService,
LWhFormOutputService lWhFormOutputService,
LWarehouseFlowService lWarehouseFlowService,
- JdbcTemplate jdbcTemplate
- ) {
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService) {
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.codeGeneratorService = codeGeneratorService;
@@ -60,8 +56,8 @@
this.lWhFormTransferService = lWhFormTransferService;
this.lWhFormOutputService = lWhFormOutputService;
this.lWarehouseFlowService = lWarehouseFlowService;
- this.jdbcTemplate = jdbcTemplate;
- this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("insert_WH_GOODS_RECORD_DETAILS");
+ this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
+ this.lWhGoodsRecordService = lWhGoodsRecordService;
}
@@ -169,6 +165,7 @@
return null;
}
// 瑕佸嚭鐗╁搧鐨勪粨搴搃d
+ Integer outWarehouseType = lWhFormOutput.getOutWarehouseType();
Long outWarehouseId = lWhFormOutput.getWarehouseId();
String warehouseName = lWhFormOutput.getWarehouseName();
@@ -245,10 +242,10 @@
whGoodsRecord.setThisCount(counts);
//閫氳繃LockManage鑾峰緱閿�
- Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseId, baseGoodsModelsId);
+ Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseType, outWarehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);
if (goodsModelNum < counts) {
log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
// 鎵嬪姩鍥炴粴
@@ -259,10 +256,11 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
- List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
- lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
+ List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
+ lWhGoodsService.modGoodsTransfering(outGoodsId, outWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
- sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
+ lWhGoodsRecordService.insert(whGoodsRecord);
}
});
LWarehouseFlow warehouseFlow = new LWarehouseFlow();
@@ -284,13 +282,5 @@
return lWarehouseFlowId;
}
- public void sameGoodsInsertMore(List<Long> outGoodsId, long whGoodsRecordId, short thisType) {
- SqlParameterSource in = new MapSqlParameterSource()
- .addValue("WHGOODSIDList", StringUtils.join(outGoodsId))
- .addValue("WH_GOODS_RECORD_ID", whGoodsRecordId)
- .addValue("THIS_TYPE", thisType);
- Map<String, Object> out = simpleJdbcCall.execute(in);
- System.out.println("Procedure result: " + out);
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index e493eaa..bda721f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -1,9 +1,7 @@
package com.consum.base.service;
-import com.consum.base.Constants;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.pojo.LWhFormOutputParam;
-import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.util.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -177,7 +175,7 @@
int flag5 = 0;
for (LWhGoodsRecord record : recordList) {
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
//5.鏂板L_WH_PROCURE_MODEL璁板綍
LWhProcureModel lWhProcureModel = new LWhProcureModel();
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
new file mode 100644
index 0000000..31c2524
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
@@ -0,0 +1,192 @@
+package com.consum.base.service;
+
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.util.LockManage;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+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
+ * @Author cy
+ * @Date 2023/10/30
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+@Slf4j
+public class LWhFormScrappedCoreService {
+ private LWhFormScrappedService lWhFormScrappedService;
+ private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
+ private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private LWhGoodsService lWhGoodsService;
+ private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
+ private LWhGoodsRecordService lWhGoodsRecordService;
+ private LWarehouseFlowService lWarehouseFlowService;
+
+ @Autowired
+ public LWhFormScrappedCoreService(LWhFormScrappedService lWhFormScrappedService,
+ LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
+ BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ LWhGoodsService lWhGoodsService,
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService,
+ LWarehouseFlowService lWarehouseFlowService) {
+ this.lWhFormScrappedService = lWhFormScrappedService;
+ this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
+ this.baseGoodsTemplateService = baseGoodsTemplateService;
+ this.lWhGoodsService = lWhGoodsService;
+ this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
+ this.lWhGoodsRecordService = lWhGoodsRecordService;
+ this.lWarehouseFlowService = lWarehouseFlowService;
+ }
+
+
+ /**
+ * 鏍规嵁 鎶ュ簾鍗曘�怢_WH_FORM_SCRAPPED銆� 鎶ュ簾鐗╁搧
+ *
+ * @param formScrappedId 鎶ュ簾鍗旾d
+ * @return 娴佹按璁板綍鎬昏〃ID
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long outFormByTransId(Long formScrappedId, S_user_core currentUser, Long dealTime) {
+ if (formScrappedId == null) {
+ return null;
+ }
+ LWhFormScrapped lWhFormScrapped = new LWhFormScrapped(formScrappedId);
+ lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
+ if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
+ log.error("鎶ュ簾澶辫触锛佽妫�鏌ユ姤搴熷崟鐘舵��");
+ return null;
+ }
+
+ Long userId = currentUser.getId();
+ String nickName = currentUser.getNick_name();
+
+ Integer warehouseType = lWhFormScrapped.getWarehouseType();
+ Long warehouseId = lWhFormScrapped.getWarehouseId();
+ String warehouseName = lWhFormScrapped.getWarehouseName();
+ // 娴佹按璁板綍鎬昏〃ID
+ long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
+
+ //瑕佹姤搴熺殑鐗╁搧
+ LWhFormScrappedGoods goods = new LWhFormScrappedGoods();
+ goods.setFormScrappedId(formScrappedId);
+ List<LWhFormScrappedGoods> formScrappedGoods = lWhFormScrappedGoodsService.select(goods);
+ if (CollectionUtils.isEmpty(formScrappedGoods)) {
+ log.error("娌℃湁瑕佹姤搴熺殑鐗╁搧");
+ return null;
+ }
+
+ // 鎸夊瀷鍙峰垎缁�
+ 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();
+ //瀵规瘡缁勪腑瑕佹姤搴熺殑鏁伴噺姹傚拰
+ List<LWhFormScrappedGoods> modelGoodsList = entry.getValue();
+ //鏌ヨ鍨嬪彿淇℃伅
+ Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
+ //瑕佹姤搴熺殑鎬绘暟閲�
+ int modelTotalNum = modelGoodsList.stream().mapToInt(LWhFormScrappedGoods::getCounts).sum();
+ Long tempGoodsId = (Long) tempGoodsInfo.get("goodsid");
+ String goodsName = (String) tempGoodsInfo.get("goodsname");
+ String modelName = (String) tempGoodsInfo.get("modelname");
+ // 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
+ long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
+ LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
+ whGoodsRecord.setId(whGoodsRecordId);
+ whGoodsRecord.setWarehouseType(warehouseType);
+ whGoodsRecord.setWarehouseId(warehouseId);
+ whGoodsRecord.setWarehouseFlowId(lWarehouseFlowId);
+ whGoodsRecord.setBaseGoodsTemplateId(tempGoodsId);
+ whGoodsRecord.setGoodsTemplateName(goodsName);
+ whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
+ whGoodsRecord.setBaseGoodsModelsName(modelName);
+ whGoodsRecord.setDealTime(dealTime);
+ //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ whGoodsRecord.setThisType(2);
+ whGoodsRecord.setThisCount(modelTotalNum);
+
+ //閫氳繃LockManage鑾峰緱閿�
+ Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
+ synchronized (warehouseModelLockObj) {
+ for (LWhFormScrappedGoods formScrappedGood : modelGoodsList) {
+ //鎶ュ簾鏁伴噺
+ Integer counts = formScrappedGood.getCounts();
+ //鎶ュ簾鍗曠紪鍙�
+ Long transBusinessId = formScrappedGood.getTransBusinessId();
+
+ int goodsModelNum = 0;
+ List<Long> srappedGoodsIds = null;
+ if (warehouseType == null || warehouseType == 0) {
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null, baseGoodsModelsId, (short) 1, counts);
+ } else {
+ //浣跨敤浜哄憳鍚嶇О
+ String userName = formScrappedGood.getUserName();
+ // 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId, (short) 2, counts);
+ }
+ if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
+ log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
+ // 鎵嬪姩鍥炴粴
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("鎶ュ簾澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+ }
+
+ whGoodsRecord.setInitialCount(goodsModelNum);
+ whGoodsRecord.setEndCount(goodsModelNum - counts);
+
+ // 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, (short) 3);
+ // 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
+ }
+ lWhGoodsRecordService.insert(whGoodsRecord);
+ }
+
+ }
+ LWarehouseFlow warehouseFlow = new LWarehouseFlow();
+ warehouseFlow.setId(lWarehouseFlowId);
+ warehouseFlow.setWarehouseType(warehouseType);
+ warehouseFlow.setWarehouseId(warehouseId);
+ warehouseFlow.setWarehouseName(warehouseName);
+ warehouseFlow.setThisType(2);
+ warehouseFlow.setBusinessType(WhBusinessEnum.BAOFEI.getValue() + 0);
+ warehouseFlow.setBusinessFormId(formScrappedId);
+ warehouseFlow.setOperatorId(userId);
+ warehouseFlow.setOperatorName(nickName);
+ warehouseFlow.setDealTime(dealTime);
+ // 鎻掑叆娴佹按鎬昏〃
+ int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ if (flowInsertFlag == 0) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return null;
+ }
+ // 鏇存柊鎶ュ簾鍗�
+ lWhFormScrapped = new LWhFormScrapped(formScrappedId);
+ lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
+ if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
+ log.error("鎶ュ簾澶辫触锛佽妫�鏌ユ姤搴熷崟鐘舵��");
+ return null;
+ }
+ lWhFormScrapped.setLWarehouseFlowId(lWarehouseFlowId);
+ lWhFormScrapped.setStates(1);
+ lWhFormScrapped.setOperatorId(userId);
+ lWhFormScrapped.setOperatorName(nickName);
+ lWhFormScrapped.setDealTime(dealTime);
+ lWhFormScrappedService.update(lWhFormScrapped);
+ return lWarehouseFlowId;
+ }
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
new file mode 100644
index 0000000..49e807a
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName LWhFormScrappedGoodsService
+ * @Author cy
+ * @Date 2023/10/30
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhFormScrappedGoodsService extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedService.java
new file mode 100644
index 0000000..4b271da
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedService.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName LWhFormScrappedService
+ * @Author cy
+ * @Date 2023/10/30
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhFormScrappedService extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index 44335c4..da88dcb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -1,11 +1,10 @@
package com.consum.base.service;
-import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.*;
+import com.consum.base.pojo.LWhFormTransferParam;
+import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.util.IdUtil;
import com.consum.model.po.*;
import com.consum.model.vo.LWhFormOutputVo;
@@ -108,7 +107,7 @@
lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
lWhProcureModel.setCounts(model.getCounts());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
new file mode 100644
index 0000000..6925783
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
@@ -0,0 +1,42 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcCall;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName LWhGoodsRecordDetailsService
+ * @Author cy
+ * @Date 2023/10/31
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhGoodsRecordDetailsService extends BaseServiceImpl {
+ private final JdbcTemplate jdbcTemplate;
+ private SimpleJdbcCall simpleJdbcCall;
+
+ @Autowired
+ public LWhGoodsRecordDetailsService(JdbcTemplate jdbcTemplate) {
+ this.jdbcTemplate = jdbcTemplate;
+ this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("insert_WH_GOODS_RECORD_DETAILS");
+ }
+
+ public void sameGoodsInsertMore(List<Long> outGoodsId, long whGoodsRecordId, short thisType) {
+ SqlParameterSource in = new MapSqlParameterSource()
+ .addValue("WHGOODSIDList", StringUtils.join(outGoodsId))
+ .addValue("WH_GOODS_RECORD_ID", whGoodsRecordId)
+ .addValue("THIS_TYPE", thisType);
+ Map<String, Object> out = simpleJdbcCall.execute(in);
+ System.out.println("Procedure result: " + out);
+ }
+
+}
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 25bf8ac..495a2cf 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
@@ -2,6 +2,7 @@
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;
@@ -22,6 +23,7 @@
/**
+ * @param warehouseType 浠撳簱绫诲瀷0鏈烘瀯1閮ㄩ棬
* @param warehouseId 鎵�灞炰粨搴撲粨搴撶紪鍙�
* @param baseGoodsModelsId 瑙勬牸鍨嬪彿缂栧彿
* @param states 锛�0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
@@ -30,10 +32,14 @@
*/
private static String query_Goods_Model_Num = "SELECT COUNT(1) from L_WH_GOODS where 1=1";
- public int queryGoodsModelNum(Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType) {
+ public int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType) {
StringBuilder sql = new StringBuilder(query_Goods_Model_Num);
Map<String, Object> paramts = new HashMap<>();
+ if (warehouseType != null) {
+ sql.append(" and WAREHOUSE_TYPE=:warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
if (warehouseId != null) {
sql.append(" and WAREHOUSE_ID=:warehouseId");
paramts.put("warehouseId", warehouseId);
@@ -66,9 +72,13 @@
*/
private static String QUERY_OUT_GOODS_ID = "SELECT*FROM L_WH_GOODS WHERE 1=1";
- public List<Map<String, Object>> queryOutGoods(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) {
+ sql.append(" and WAREHOUSE_TYPE=:warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
if (warehouseId != null) {
sql.append(" and WAREHOUSE_ID=:warehouseId");
paramts.put("warehouseId", warehouseId);
@@ -78,7 +88,7 @@
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
}
if (states != null) {
- sql.append(" and STATES=:STATES");
+ sql.append(" and STATES=:states");
paramts.put("states", states);
}
if (buyType != null) {
@@ -99,14 +109,99 @@
* @param goodsModelNum 鍙栧嚭鐨勬暟閲�
* @return
*/
- public List<Long> queryOutGoodsId(Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
- List<Map<String, Object>> outGoods = queryOutGoods(warehouseId, baseGoodsModelsId, states, buyType, goodsModelNum);
+ public List<Long> queryOutGoodsId(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ List<Map<String, Object>> outGoods = queryOutGoods(warehouseType, warehouseId, baseGoodsModelsId, states, buyType, goodsModelNum);
if (CollectionUtils.isEmpty(outGoods)) {
return null;
}
List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
return whGoodsIds;
}
+
+
+ /**
+ * 鏌ヨ鎶ュ簾鐗╁搧
+ * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ *
+ * @param warehouseType
+ * @param warehouseId
+ * @param transBusinessId 璋冩嫧鍗曞彿
+ * @param nowUserName 浣跨敤浜哄鍚�
+ * @param baseGoodsModelsId 鐗╁搧鍨嬪彿
+ * @param states 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
+ * @param goodsModelNum 鍙栧嚭鐨勬暟閲�
+ * @return
+ */
+ private static String QUERY_SCRAPPED_GOODS_PREFIX = "SELECT goods.id FROM L_WH_GOODS goods LEFT JOIN (SELECT t2.*FROM (SELECT max(DEAL_TIME) DEAL_TIME,WH_GOODS_ID FROM L_GOODS_USER_RECORD GROUP BY WH_GOODS_ID) t1 LEFT JOIN L_GOODS_USER_RECORD t2 ON t1.DEAL_TIME=t2.DEAL_TIME AND t1.WH_GOODS_ID=t2.WH_GOODS_ID) useRecord ON goods.id=useRecord.WH_GOODS_ID WHERE 1=1";
+ 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) {
+ if (warehouseType == null) {
+ warehouseType = 0;
+ }
+ StringBuilder sql = new StringBuilder(QUERY_SCRAPPED_GOODS_PREFIX);
+ Map<String, Object> paramts = new HashMap<>();
+ if (warehouseType != null) {
+ sql.append(" AND goods.WAREHOUSE_TYPE=:warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
+ if (warehouseId != null) {
+ sql.append(" AND goods.WAREHOUSE_ID=:warehouseId");
+ paramts.put("warehouseId", warehouseId);
+ }
+ if (transBusinessId != null) {
+ sql.append(" and useRecord.TRANS_BUSINESS_ID=:transBusinessId");
+ paramts.put("transBusinessId", transBusinessId);
+ }
+ if (StringUtils.isNotEmpty(nowUserName)) {
+ sql.append(" AND useRecord.NOW_USER_NAME=:nowUserName");
+ paramts.put("nowUserName", nowUserName);
+ }
+ if (baseGoodsModelsId != null) {
+ sql.append(" AND goods.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
+ if (states != null) {
+ sql.append(" AND goods.STATES=:states");
+ paramts.put("states", states);
+ }
+ return select(sql.append(QUERY_SCRAPPED_GOODS_END).append(" limit").append(goodsModelNum).toString(), paramts);
+ }
+
+ /**
+ * 鏌ヨ鎶ュ簾鐗╁搧
+ * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ *
+ * @param warehouseType
+ * @param warehouseId
+ * @param transBusinessId 璋冩嫧鍗曞彿
+ * @param nowUserName 浣跨敤浜哄鍚�
+ * @param baseGoodsModelsId 鐗╁搧鍨嬪彿
+ * @param states 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
+ * @param goodsModelNum 鍙栧嚭鐨勬暟閲�
+ * @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);
+ if (CollectionUtils.isEmpty(outGoods)) {
+ return null;
+ }
+ List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ return whGoodsIds;
+ }
+
/**
* 璁剧疆鐗╁搧鐘舵�佷负璋冩嫧涓�
@@ -118,9 +213,13 @@
*/
private static String MOD_GOODS_TRANSFERING_PREFIX = "update L_WH_GOODS set";
- public int modGoodsTransfering(List<Long> whGoods, Long toWarehouseId, String toWarehouseName, Short states) {
+ 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);
@@ -138,4 +237,6 @@
params.add(whGoods);
return update(sql.toString(), params.toArray());
}
+
+
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java
index 022416b..dbab741 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord.java
@@ -20,17 +20,17 @@
protected boolean isset_id = false;
// 灞炴�у垪琛�
- private Long goodsUserPhone = null;
+ private Long whGoodsId = null;
@JsonIgnore
- protected boolean isset_goodsUserPhone = false;
+ protected boolean isset_whGoodsId = false;
private Integer recordType = null;
@JsonIgnore
protected boolean isset_recordType = false;
- private Long lastRecordId = null;
+ private Long transBusinessId = null;
@JsonIgnore
- protected boolean isset_lastRecordId = false;
+ protected boolean isset_transBusinessId = false;
private Long nowUserPhone = null;
@JsonIgnore
@@ -87,18 +87,18 @@
return this.id == null;
}
- public Long getGoodsUserPhone() {
- return this.goodsUserPhone;
+ public Long getWhGoodsId() {
+ return this.whGoodsId;
}
- public void setGoodsUserPhone(Long goodsUserPhone) {
- this.goodsUserPhone = goodsUserPhone;
- this.isset_goodsUserPhone = true;
+ public void setWhGoodsId(Long whGoodsId) {
+ this.whGoodsId = whGoodsId;
+ this.isset_whGoodsId = true;
}
@JsonIgnore
- public boolean isEmptyGoodsUserPhone() {
- return this.goodsUserPhone == null;
+ public boolean isEmptyWhGoodsId() {
+ return this.whGoodsId == null;
}
public Integer getRecordType() {
@@ -115,18 +115,18 @@
return this.recordType == null;
}
- public Long getLastRecordId() {
- return this.lastRecordId;
+ public Long getTransBusinessId() {
+ return this.transBusinessId;
}
- public void setLastRecordId(Long lastRecordId) {
- this.lastRecordId = lastRecordId;
- this.isset_lastRecordId = true;
+ public void setTransBusinessId(Long transBusinessId) {
+ this.transBusinessId = transBusinessId;
+ this.isset_transBusinessId = true;
}
@JsonIgnore
- public boolean isEmptyLastRecordId() {
- return this.lastRecordId == null;
+ public boolean isEmptyTransBusinessId() {
+ return this.transBusinessId == null;
}
public Long getNowUserPhone() {
@@ -206,9 +206,9 @@
public String toString() {
return new StringBuilder()
.append("id=").append(this.id)
- .append("goodsUserPhone=").append(this.goodsUserPhone)
+ .append("whGoodsId=").append(this.whGoodsId)
.append("recordType=").append(this.recordType)
- .append("lastRecordId=").append(this.lastRecordId)
+ .append("transBusinessId=").append(this.transBusinessId)
.append("nowUserPhone=").append(this.nowUserPhone)
.append("nowUserName=").append(this.nowUserName)
.append("operatorId=").append(this.operatorId)
@@ -231,14 +231,14 @@
l_goods_user_record.setId(this.getId());
}
// 鏅�氬睘鎬�
- if (this.isset_goodsUserPhone) {
- l_goods_user_record.setGoodsUserPhone(this.getGoodsUserPhone());
+ if (this.isset_whGoodsId) {
+ l_goods_user_record.setWhGoodsId(this.getWhGoodsId());
}
if (this.isset_recordType) {
l_goods_user_record.setRecordType(this.getRecordType());
}
- if (this.isset_lastRecordId) {
- l_goods_user_record.setLastRecordId(this.getLastRecordId());
+ if (this.isset_transBusinessId) {
+ l_goods_user_record.setTransBusinessId(this.getTransBusinessId());
}
if (this.isset_nowUserPhone) {
l_goods_user_record.setNowUserPhone(this.getNowUserPhone());
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java
index c39ab0b..61f751e 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsUserRecord_mapper.java
@@ -7,8 +7,6 @@
import com.walker.jdbc.sqlgen.InsertBuilder;
import com.walker.jdbc.sqlgen.SelectBuilder;
import com.walker.jdbc.sqlgen.UpdateBuilder;
-import com.walker.jdbc.util.StringUtils;
-
import org.springframework.jdbc.core.RowMapper;
import java.sql.ResultSet;
@@ -28,9 +26,9 @@
// 涓婚敭
public static final String Id = "id";
// 鏅�氬睘鎬�
- public static final String GoodsUserPhone = "goods_user_phone";
+ public static final String WhGoodsId = "wh_goods_id";
public static final String RecordType = "record_type";
- public static final String LastRecordId = "last_record_id";
+ public static final String TransBusinessId = "trans_business_id";
public static final String NowUserPhone = "now_user_phone";
public static final String NowUserName = "now_user_name";
public static final String OperatorId = "operator_id";
@@ -49,14 +47,14 @@
this.setId(lGoodsUserRecord.getId());
}
//鏅�氬睘鎬�
- if (lGoodsUserRecord.isset_goodsUserPhone) {
- this.setGoodsUserPhone(lGoodsUserRecord.getGoodsUserPhone());
+ if (lGoodsUserRecord.isset_whGoodsId) {
+ this.setWhGoodsId(lGoodsUserRecord.getWhGoodsId());
}
if (lGoodsUserRecord.isset_recordType) {
this.setRecordType(lGoodsUserRecord.getRecordType());
}
- if (lGoodsUserRecord.isset_lastRecordId) {
- this.setLastRecordId(lGoodsUserRecord.getLastRecordId());
+ if (lGoodsUserRecord.isset_transBusinessId) {
+ this.setTransBusinessId(lGoodsUserRecord.getTransBusinessId());
}
if (lGoodsUserRecord.isset_nowUserPhone) {
this.setNowUserPhone(lGoodsUserRecord.getNowUserPhone());
@@ -116,9 +114,9 @@
public SqlAndParameters<Map<String, Object>> getInsertSql_() {
InsertBuilder ib = new InsertBuilder(this.getTableName_());
ib.set(Id, this.getId());
- ib.set(GoodsUserPhone, this.getGoodsUserPhone(), this.isset_goodsUserPhone);
+ ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ib.set(RecordType, this.getRecordType(), this.isset_recordType);
- ib.set(LastRecordId, this.getLastRecordId(), this.isset_lastRecordId);
+ ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
ib.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
ib.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -133,9 +131,9 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(GoodsUserPhone, this.getGoodsUserPhone(), this.isset_goodsUserPhone);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(RecordType, this.getRecordType(), this.isset_recordType);
- ub.set(LastRecordId, this.getLastRecordId(), this.isset_lastRecordId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -151,9 +149,9 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(GoodsUserPhone, this.getGoodsUserPhone(), this.isset_goodsUserPhone);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(RecordType, this.getRecordType(), this.isset_recordType);
- ub.set(LastRecordId, this.getLastRecordId(), this.isset_lastRecordId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -168,9 +166,9 @@
@Override
public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
- ub.set(GoodsUserPhone, this.getGoodsUserPhone(), this.isset_goodsUserPhone);
+ ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId);
ub.set(RecordType, this.getRecordType(), this.isset_recordType);
- ub.set(LastRecordId, this.getLastRecordId(), this.isset_lastRecordId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
ub.set(NowUserPhone, this.getNowUserPhone(), this.isset_nowUserPhone);
ub.set(NowUserName, this.getNowUserName(), this.isset_nowUserName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -223,7 +221,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, goods_user_phone, record_type, last_record_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -231,7 +229,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, goods_user_phone, record_type, last_record_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, wh_goods_id, record_type, trans_business_id, now_user_phone, now_user_name, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -268,12 +266,12 @@
l_goods_user_record.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
- columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.GoodsUserPhone);
+ columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.WhGoodsId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_goods_user_record.setGoodsUserPhone(null);
+ l_goods_user_record.setWhGoodsId(null);
} else {
- l_goods_user_record.setGoodsUserPhone(rs.getLong(columnIndex));
+ l_goods_user_record.setWhGoodsId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.RecordType);
@@ -284,12 +282,12 @@
l_goods_user_record.setRecordType(rs.getInt(columnIndex));
}
}
- columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.LastRecordId);
+ columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.TransBusinessId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_goods_user_record.setLastRecordId(null);
+ l_goods_user_record.setTransBusinessId(null);
} else {
- l_goods_user_record.setLastRecordId(rs.getLong(columnIndex));
+ l_goods_user_record.setTransBusinessId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LGoodsUserRecord_mapper.NowUserPhone);
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
index eb4ffd8..55e6a4b 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
@@ -28,6 +28,10 @@
@JsonIgnore
protected boolean isset_businessFormCode = false;
+ private Integer warehouseType = null;
+ @JsonIgnore
+ protected boolean isset_warehouseType = false;
+
private Long warehouseId = null;
@JsonIgnore
protected boolean isset_warehouseId = false;
@@ -35,10 +39,6 @@
private String warehouseName = null;
@JsonIgnore
protected boolean isset_warehouseName = false;
-
- private Integer scrappedType = null;
- @JsonIgnore
- protected boolean isset_scrappedType = false;
private Long agencyId = null;
@JsonIgnore
@@ -139,6 +139,20 @@
return this.businessFormCode == null || this.businessFormCode.length() == 0;
}
+ public Integer getWarehouseType() {
+ return this.warehouseType;
+ }
+
+ public void setWarehouseType(Integer warehouseType) {
+ this.warehouseType = warehouseType;
+ this.isset_warehouseType = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseType() {
+ return this.warehouseType == null;
+ }
+
public Long getWarehouseId() {
return this.warehouseId;
}
@@ -165,20 +179,6 @@
@JsonIgnore
public boolean isEmptyWarehouseName() {
return this.warehouseName == null || this.warehouseName.length() == 0;
- }
-
- public Integer getScrappedType() {
- return this.scrappedType;
- }
-
- public void setScrappedType(Integer scrappedType) {
- this.scrappedType = scrappedType;
- this.isset_scrappedType = true;
- }
-
- @JsonIgnore
- public boolean isEmptyScrappedType() {
- return this.scrappedType == null;
}
public Long getAgencyId() {
@@ -316,9 +316,9 @@
.append("id=").append(this.id)
.append("lWarehouseFlowId=").append(this.lWarehouseFlowId)
.append("businessFormCode=").append(this.businessFormCode)
+ .append("warehouseType=").append(this.warehouseType)
.append("warehouseId=").append(this.warehouseId)
.append("warehouseName=").append(this.warehouseName)
- .append("scrappedType=").append(this.scrappedType)
.append("agencyId=").append(this.agencyId)
.append("agencyName=").append(this.agencyName)
.append("operatorId=").append(this.operatorId)
@@ -351,14 +351,14 @@
if (this.isset_businessFormCode) {
l_wh_form_scrapped.setBusinessFormCode(this.getBusinessFormCode());
}
+ if (this.isset_warehouseType) {
+ l_wh_form_scrapped.setWarehouseType(this.getWarehouseType());
+ }
if (this.isset_warehouseId) {
l_wh_form_scrapped.setWarehouseId(this.getWarehouseId());
}
if (this.isset_warehouseName) {
l_wh_form_scrapped.setWarehouseName(this.getWarehouseName());
- }
- if (this.isset_scrappedType) {
- l_wh_form_scrapped.setScrappedType(this.getScrappedType());
}
if (this.isset_agencyId) {
l_wh_form_scrapped.setAgencyId(this.getAgencyId());
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java
index 30a7746..7e5f08c 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java
@@ -30,9 +30,9 @@
// 鏅�氬睘鎬�
public static final String LWarehouseFlowId = "l_warehouse_flow_id";
public static final String BusinessFormCode = "business_form_code";
+ public static final String WarehouseType = "warehouse_type";
public static final String WarehouseId = "warehouse_id";
public static final String WarehouseName = "warehouse_name";
- public static final String ScrappedType = "scrapped_type";
public static final String AgencyId = "agency_id";
public static final String AgencyName = "agency_name";
public static final String OperatorId = "operator_id";
@@ -61,14 +61,14 @@
if (lWhFormScrapped.isset_businessFormCode) {
this.setBusinessFormCode(lWhFormScrapped.getBusinessFormCode());
}
+ if (lWhFormScrapped.isset_warehouseType) {
+ this.setWarehouseType(lWhFormScrapped.getWarehouseType());
+ }
if (lWhFormScrapped.isset_warehouseId) {
this.setWarehouseId(lWhFormScrapped.getWarehouseId());
}
if (lWhFormScrapped.isset_warehouseName) {
this.setWarehouseName(lWhFormScrapped.getWarehouseName());
- }
- if (lWhFormScrapped.isset_scrappedType) {
- this.setScrappedType(lWhFormScrapped.getScrappedType());
}
if (lWhFormScrapped.isset_agencyId) {
this.setAgencyId(lWhFormScrapped.getAgencyId());
@@ -142,9 +142,9 @@
ib.set(Id, this.getId());
ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ib.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -165,9 +165,9 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -189,9 +189,9 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -212,9 +212,9 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(ScrappedType, this.getScrappedType(), this.isset_scrappedType);
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -271,7 +271,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_id, warehouse_name, scrapped_type, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -279,7 +279,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_id, warehouse_name, scrapped_type, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -328,6 +328,14 @@
if (columnIndex > 0) {
l_wh_form_scrapped.setBusinessFormCode(rs.getString(columnIndex));
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_scrapped.setWarehouseType(null);
+ } else {
+ l_wh_form_scrapped.setWarehouseType(rs.getInt(columnIndex));
+ }
+ }
columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
@@ -339,14 +347,6 @@
columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.WarehouseName);
if (columnIndex > 0) {
l_wh_form_scrapped.setWarehouseName(rs.getString(columnIndex));
- }
- columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.ScrappedType);
- if (columnIndex > 0) {
- if (rs.getBigDecimal(columnIndex) == null) {
- l_wh_form_scrapped.setScrappedType(null);
- } else {
- l_wh_form_scrapped.setScrappedType(rs.getInt(columnIndex));
- }
}
columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.AgencyId);
if (columnIndex > 0) {
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
index e3db5c0..33632dd 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
@@ -20,6 +20,10 @@
protected boolean isset_id = false;
// 灞炴�у垪琛�
+ private Integer warehouseType = null;
+ @JsonIgnore
+ protected boolean isset_warehouseType = false;
+
private Long warehouseId = null;
@JsonIgnore
protected boolean isset_warehouseId = false;
@@ -97,6 +101,20 @@
@JsonIgnore
public boolean isEmptyId() {
return this.id == null;
+ }
+
+ public Integer getWarehouseType() {
+ return this.warehouseType;
+ }
+
+ public void setWarehouseType(Integer warehouseType) {
+ this.warehouseType = warehouseType;
+ this.isset_warehouseType = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseType() {
+ return this.warehouseType == null;
}
public Long getWarehouseId() {
@@ -260,6 +278,7 @@
public String toString() {
return new StringBuilder()
.append("id=").append(this.id)
+ .append("warehouseType=").append(this.warehouseType)
.append("warehouseId=").append(this.warehouseId)
.append("warehouseFlowId=").append(this.warehouseFlowId)
.append("initialCount=").append(this.initialCount)
@@ -288,6 +307,9 @@
l_wh_goods_record.setId(this.getId());
}
// 鏅�氬睘鎬�
+ if (this.isset_warehouseType) {
+ l_wh_goods_record.setWarehouseType(this.getWarehouseType());
+ }
if (this.isset_warehouseId) {
l_wh_goods_record.setWarehouseId(this.getWarehouseId());
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
index a115a9f..834f0d2 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
@@ -26,6 +26,7 @@
// 涓婚敭
public static final String Id = "id";
// 鏅�氬睘鎬�
+ public static final String WarehouseType = "warehouse_type";
public static final String WarehouseId = "warehouse_id";
public static final String WarehouseFlowId = "warehouse_flow_id";
public static final String InitialCount = "initial_count";
@@ -50,6 +51,9 @@
this.setId(lWhGoodsRecord.getId());
}
//鏅�氬睘鎬�
+ if (lWhGoodsRecord.isset_warehouseType) {
+ this.setWarehouseType(lWhGoodsRecord.getWarehouseType());
+ }
if (lWhGoodsRecord.isset_warehouseId) {
this.setWarehouseId(lWhGoodsRecord.getWarehouseId());
}
@@ -126,6 +130,7 @@
public SqlAndParameters<Map<String, Object>> getInsertSql_() {
InsertBuilder ib = new InsertBuilder(this.getTableName_());
ib.set(Id, this.getId());
+ ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ib.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
@@ -146,6 +151,7 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
@@ -167,6 +173,7 @@
@Override
public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
@@ -187,6 +194,7 @@
@Override
public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType);
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount);
@@ -245,7 +253,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -253,7 +261,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -290,6 +298,14 @@
l_wh_goods_record.setId(rs.getLong(columnIndex));
}
//鏅�氬睘鎬�
+ columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_goods_record.setWarehouseType(null);
+ } else {
+ l_wh_goods_record.setWarehouseType(rs.getInt(columnIndex));
+ }
+ }
columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
--
Gitblit v1.9.1