From 85cbeedbf3e6c7a46afb53090d0ed44a52883f46 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 02 十一月 2023 19:19:32 +0800
Subject: [PATCH] feat: 调拨调整
---
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputExtend.java | 2
consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java | 17 +
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java | 16 +
consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java | 16 +
consum-base/src/main/java/com/consum/base/core/util/LockManage.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 14
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 2
consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserUpdParam.java | 2
consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureExtend.java | 2
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 29 -
consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java | 2
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java | 38 ++
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java | 2
consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord.java | 172 +++++++++++
consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java | 2
consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 12
consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordService.java | 3
consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureGoodsParams.java | 2
consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord_mapper.java | 269 +++++++++++++++++
consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 116 +++++++
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 53 +++
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 2
consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java | 2
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 2
consum-base/src/main/java/com/consum/base/service/LGoodsWhRecordServiceImpl.java | 41 ++
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 2
consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java | 2
consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java | 2
consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java | 2
consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java | 2
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 4
consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java | 2
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java | 5
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 2
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java | 44 ++
consum-base/src/main/java/com/consum/base/service/LWhFormProcureGoodsService.java | 2
40 files changed, 817 insertions(+), 80 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java b/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
index c747010..84783f0 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
@@ -12,7 +12,7 @@
/**
* @ClassName LOrgSupplierController
- * @Author cy
+
* @Date 2023/11/2
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index bf18cec..29112e6 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -15,7 +15,7 @@
/**
* @ClassName lWarehouseFlowController
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
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 6e32918..da51970 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
@@ -25,7 +25,7 @@
/**
* @ClassName LWhFormProcureController
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
@@ -155,7 +155,7 @@
// 鎻掑叆 閲囪喘鍗曠墿鍝併�怢_WH_FORM_PROCURE_GOODS銆�
LWhFormProcure lWhFormProcure = new LWhFormProcure();
lWhFormProcure.setId(whFormProcureId);
- lWhFormProcure.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.Procure_Warehouse.getValue(), 10));
+ lWhFormProcure.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse));
lWhFormProcure.setWarehouseId(warehouseId);
lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
lWhFormProcure.setBuyerId(currentUser.getId());
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index f70e2bb..83bbca7 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
@@ -25,7 +25,7 @@
System.out.println(prefix);
}
- public String createCodeByPrefix(String prefix,int length){
+ private String createCodeByPrefix(String prefix,int length){
String CODE_PREFIX = prefix;
String sql = "SELECT * from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX";
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 3df3162..9e6a578 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
@@ -2,7 +2,7 @@
/**
* @ClassName WhBusinessEnum
- * @Author cy
+
* @Date 2023/10/24
* @Description 鍗曟嵁绫诲瀷
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java b/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
index 721cbac..abbaf48 100644
--- a/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
+++ b/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
@@ -9,7 +9,7 @@
/**
* @ClassName MapRowMapper
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
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 ac6f8b8..a75169d 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
@@ -4,7 +4,7 @@
/**
* @ClassName LockManage
- * @Author cy
+
* @Date 2023/10/25
* @Description 鍏ㄥ眬閿佺鐞嗗櫒
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserUpdParam.java b/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserUpdParam.java
index 312f8fc..38ed879 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserUpdParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/FinSysTenantUserUpdParam.java
@@ -4,7 +4,7 @@
/**
* @ClassName FinSysTenantUserUpdParam
- * @Author cy
+
* @Date 2023/9/6
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
index e3d6e9a..ac2cba4 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java
@@ -4,7 +4,7 @@
/**
* @ClassName LWarehouseFlowParam
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputExtend.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputExtend.java
index 49648a1..10d7587 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputExtend.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputExtend.java
@@ -8,7 +8,7 @@
/**
* @ClassName LWhFormProcureExtend
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureExtend.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureExtend.java
index 494b8e6..a537924 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureExtend.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureExtend.java
@@ -7,7 +7,7 @@
/**
* @ClassName LWhFormProcureExtend
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureGoodsParams.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureGoodsParams.java
index e80c181..385e394 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureGoodsParams.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureGoodsParams.java
@@ -6,7 +6,7 @@
/**
* @ClassName LWhFormProcureGoodsParams
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
index 295e0de..e674595 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhFormProcureParam.java
@@ -6,7 +6,7 @@
/**
* @ClassName LWhFormProcureParam
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
index ba90069..3c666c5 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/LWhProcureModelParams.java
@@ -4,7 +4,7 @@
/**
* @ClassName LWhProcureModelParams
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java
new file mode 100644
index 0000000..fd7d889
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/GoodsBaseServiceImpl.java
@@ -0,0 +1,17 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName GoodsBaseServiceImpl
+
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class GoodsBaseServiceImpl extends BaseServiceImpl {
+
+
+}
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
new file mode 100644
index 0000000..4738495
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
@@ -0,0 +1,53 @@
+package com.consum.base.service;
+
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName LGoodsUserRecordCoreService
+
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LGoodsUserRecordCoreService {
+ @Resource
+ private GoodsBaseServiceImpl goodsBaseService;
+
+
+ /**
+ * 閫氳繃鏂版棫 鐗╁搧浣跨敤浜轰慨鏀硅褰曘�怢_WH_PROCURE_MODEL_USER_RECORD銆戜腑鐨処D 锛� 鏉ヤ慨鏀圭墿鍝佷娇鐢ㄤ汉
+ *
+ * @param oldProcureModelUserRecordId
+ * @param newProcureModelUserRecordId
+ * @return
+ */
+ public boolean modifyGoodsUser(Long oldProcureModelUserRecordId, Long newProcureModelUserRecordId) {
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = goodsBaseService.get(new LWhProcureModelUserRecord(newProcureModelUserRecordId));
+ if (lWhProcureModelUserRecord == null) {
+ return false;
+ }
+ Long dealTime = lWhProcureModelUserRecord.getDealTime();
+ Long operatorId = lWhProcureModelUserRecord.getOperatorId();
+ String operatorName = lWhProcureModelUserRecord.getOperatorName();
+ // 璋冩嫧鍗昳d
+ Long transBusinessId = lWhProcureModelUserRecord.getTransBusinessId();
+ LWhProcureModelUser modelUser = new LWhProcureModelUser();
+ modelUser.setProcureModelUserRecordId(newProcureModelUserRecordId);
+ List<LWhProcureModelUser> modelUserList = goodsBaseService.select(modelUser);
+ if (CollectionUtils.isEmpty(modelUserList)) {
+ return true;
+ }
+ for (LWhProcureModelUser lWhProcureModelUser : modelUserList) {
+
+ }
+ return true;
+ }
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java
new file mode 100644
index 0000000..6535954
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordServiceImpl.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName LGoodsUserRecordServiceImpl
+
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LGoodsUserRecordServiceImpl extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsWhRecordServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LGoodsWhRecordServiceImpl.java
new file mode 100644
index 0000000..43af8e3
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsWhRecordServiceImpl.java
@@ -0,0 +1,41 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName LGoodsWhRecordService
+
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class LGoodsWhRecordServiceImpl extends BaseServiceImpl {
+ private static String insert_new_record = "INSERT INTO L_GOODS_WH_RECORD (WAREHOUSE_FLOW_ID,DEAL_TIME,LAST_RECORD, WH_GOODS_ID,WAREHOUSE_TYPE, WAREHOUSE_ID)SELECT ?, ?,1,ID, WAREHOUSE_TYPE, WAREHOUSE_ID FROM L_WH_GOODS WHERE ID IN (?)";
+
+ public int insertNewRecord(List<Long> outGoodsIds, long lWarehouseFlowId, long dealTime) {
+ this.updSetNotLast(outGoodsIds);
+ ArrayList<Object> params = new ArrayList<>();
+ params.add(lWarehouseFlowId);
+ params.add(dealTime);
+ params.add(outGoodsIds);
+ return this.update(insert_new_record, params.toArray());
+ }
+
+ /**
+ * 璁剧疆涓洪潪鏈�鏂�
+ */
+ private static String updSetNotLast = "update L_GOODS_WH_RECORD set LAST_RECORD = 0 where WH_GOODS_ID in(?)";
+
+ public int updSetNotLast(List<Long> outGoodsIds) {
+ ArrayList<Object> params = new ArrayList<>();
+ params.add(outGoodsIds);
+ return this.update(updSetNotLast, params.toArray());
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
index 90c27aa..6838105 100644
--- a/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LOrgSupplierServiceImpl.java
@@ -12,7 +12,7 @@
/**
* @ClassName LOrgSupplierServiceImpl
- * @Author cy
+
* @Date 2023/11/1
* @Description
* @Version 1.0
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 28ec144..937a759 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
@@ -18,7 +18,7 @@
/**
* @ClassName LWarehouseFlowService
- * @Author cy
+
* @Date 2023/10/24
* @Description
* @Version 1.0
@@ -32,17 +32,13 @@
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsService lWhGoodsService;
private LWhGoodsRecordService lWhGoodsRecordService;
- private LWhFormTransferServiceImpl lWhFormTransferService;
- private LWhFormOutputCoreService lWhFormOutputCoreService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Autowired
- public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferServiceImpl lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
+ public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService, LWhGoodsRecordService lWhGoodsRecordService) {
this.jdbcTemplate = jdbcTemplate;
this.lWarehouseFlowService = lWarehouseFlowService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
- this.lWhFormTransferService = lWhFormTransferService;
- this.lWhFormOutputCoreService = lWhFormOutputCoreService;
this.lWhGoodsService = lWhGoodsService;
this.lWhGoodsRecordService = lWhGoodsRecordService;
this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("InsertL_WH_GOODS");
@@ -147,6 +143,7 @@
return 1;
}
+
/**
* 鍚屾牱瑙勬牸鐨勭墿鍝� 鎻掑叆澶氭锛�
* 鍚屾椂灏嗕富閿褰曞湪 杩涘嚭搴撴祦姘存槑缁嗐�怢_WH_GOODS_RECORD_DETAILS銆�,
@@ -167,7 +164,7 @@
* @param pStates 鐘舵��
* @param pTimes 鎻掑叆鏉℃暟
*/
- public void sameGoodsInsertMore(long pWarehouseFlowId, Integer warehouseType , long pWarehouseId, long pWhGoodsRecordId, short pRecordType, String pWarehouseName, short pCostType,
+ public void sameGoodsInsertMore(long pWarehouseFlowId, Integer warehouseType, long pWarehouseId, long pWhGoodsRecordId, short pRecordType, String pWarehouseName, short pCostType,
long pBaseGoodsTemplateId, String pGoodsTemplateName, long pBaseGoodsModelsId,
String pBaseGoodsModelsName, String pSupplier, short pBuyType,
String pUnit, long pPrice, long pProcureDate,
@@ -196,22 +193,4 @@
System.out.println("Procedure result: " + out);
}
- /**
- * 璋冩嫧鍑哄簱
- *
- * @param outWarehouseId 鍑哄簱鍗�
- * @return
- */
- public int outInsertWareFlow(Long outWarehouseId) {
- // 鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
-// List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
- // 淇敼鐗╁搧鐨勭姸鎬佷负 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
- // 淇敼 鎵�灞炰粨搴撲粨搴撶紪鍙稺AREHOUSE_ID銆佷粨搴撳悕绉癢AREHOUSE_NAME锛屾鏃朵笉瑕佸悓姝ヨ繘 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆戯紒鍏ュ簱鏃跺啀鍚屾
-
-
- // 鏂板璁板綍 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撱�怢_WH_GOODS_RECORD銆戣繘鍑哄簱娴佹按鏄庣粏[L_WH_GOODS_RECORD_DETAILS]
-
-
- return 0;
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index b51d5c0..4d3bba5 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -12,7 +12,7 @@
/**
* @ClassName LWarehouseFlowService
- * @Author cy
+
* @Date 2023/10/25
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index 149c587..9df82b6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -22,7 +22,7 @@
/**
* @ClassName LWhFormInventoryCoreService
- * @Author cy
+
* @Date 2023/11/1
* @Description
* @Version 1.0
@@ -191,7 +191,7 @@
BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
LWhFormProcure lWhFormProcure = new LWhFormProcure();
lWhFormProcure.setId(whFormProcureId);
- String inCode = codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.Procure_Warehouse.getValue(), 10);
+ String inCode = codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse);
lWhFormProcure.setBusinessFormCode(inCode);
lWhFormProcure.setWarehouseId(warehouseId);
lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
@@ -281,11 +281,13 @@
return null;
}
lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
- String outCode = codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.OutPut_Warehouse.getValue(), 10);
+ String outCode = codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse);
lWhFormOutput.setOutputCode(outCode);
lWhFormOutput.setOutputName("鐩樼偣鍑哄簱");
- lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
- lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+// lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ lWhFormOutput.setAgencyId(null);
+// lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+ lWhFormOutput.setAgencyName(null);
lWhFormOutput.setOperatorId(sysInfo.getId());
lWhFormOutput.setOperatorName(sysInfo.getUserName());
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 3a28b30..4a4a7e9 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
@@ -20,20 +20,20 @@
/**
* @ClassName WhFormOutputCoreService
- * @Author cy
+
* @Date 2023/10/26
* @Description
* @Version 1.0
**/
@Slf4j
@Service
+@Transactional(rollbackFor = Exception.class)
public class LWhFormOutputCoreService {
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private CodeGeneratorService codeGeneratorService;
private LWhProcureModelService lWhProcureModelService;
-// private LWhFormTransferServiceImpl lWhFormTransferService;
private LWhFormOutputService lWhFormOutputService;
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
@@ -44,7 +44,6 @@
LWhGoodsService lWhGoodsService,
CodeGeneratorService codeGeneratorService,
LWhProcureModelService lWhProcureModelService,
-// LWhFormTransferServiceImpl lWhFormTransferService,
LWhFormOutputService lWhFormOutputService,
LWarehouseFlowService lWarehouseFlowService,
LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
@@ -53,7 +52,6 @@
this.lWhGoodsService = lWhGoodsService;
this.codeGeneratorService = codeGeneratorService;
this.lWhProcureModelService = lWhProcureModelService;
-// this.lWhFormTransferService = lWhFormTransferService;
this.lWhFormOutputService = lWhFormOutputService;
this.lWarehouseFlowService = lWarehouseFlowService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
@@ -115,7 +113,7 @@
whFormOutput.setId(outWarehouseFormId);
// 姝ゆ椂骞舵病鏈夊嚭搴�
whFormOutput.setWarehouseFlowId(null);
- whFormOutput.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.OutPut_Warehouse.getValue(), 4));
+ whFormOutput.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
//杩涘嚭搴撴祦姘存�昏〃 鍏ュ簱鍗旾D
whFormOutput.setInWarehouseFlowId(null);
// 璋冩嫧鍗旾D(璋冩嫧鏃堕渶瑕�)
@@ -202,10 +200,6 @@
Short buyType = buyTypeT;
Short modGoodsTransferingStatus = modGoodsTransferingStatusT;
- // 鎺ユ敹鏂逛粨搴撲俊鎭�
- Long inWarehouseId = lWhFormOutput.getInWarehouseId();
- String inWarehouseName = lWhFormOutput.getInWarehouseName();
-
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
@@ -257,7 +251,7 @@
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
- lWhGoodsService.modGoodsTransfering(outGoodsId, outWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
+ lWhGoodsService.modGoodsTransfering(outGoodsId, null, null, null, modGoodsTransferingStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
lWhGoodsRecordService.insert(whGoodsRecord);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java
index 7ecf2ca..9372121 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java
@@ -11,7 +11,7 @@
/**
* @ClassName WhFormOutputService
- * @Author cy
+
* @Date 2023/10/26
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
index bedf47d..adb9a3e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
@@ -9,13 +9,14 @@
import com.walker.infrastructure.utils.NumberGenerator;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* @ClassName LWhFormProcureCoreService
- * @Author cy
+
* @Date 2023/10/26
* @Description
* @Version 1.0
@@ -37,6 +38,7 @@
* 绗竴姝ワ細閫氳繃閲囪喘鍗旾D鏌ヨ閲囪喘鍗曞瀷鍙枫�怢_WH_PROCURE_MODEL銆戝緱鍒板晢鍝佸瀷鍙蜂互鍙婃暟閲�
* 绗簩姝ワ細璁板綍杩涘嚭搴撴祦姘达細L_WAREHOUSE_FLOW
*/
+ @Transactional(rollbackFor = Exception.class)
public String doProcure(Long whFormProcureId, S_user_core currentUser) {
if (whFormProcureId == null) {
return "閲囪喘鍗昳d涓虹┖";
@@ -57,6 +59,7 @@
long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
LWarehouseFlow warehouseFlow = new LWarehouseFlow();
warehouseFlow.setId(lWarehouseFlowId);
+ warehouseFlow.setWarehouseType(0);
warehouseFlow.setWarehouseId(lWhFormProcure.getWarehouseId());
warehouseFlow.setWarehouseName(lWhFormProcure.getWarehouseName());
warehouseFlow.setThisType(1);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureGoodsService.java
index 979d037..5d48487 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureGoodsService.java
@@ -5,7 +5,7 @@
/**
* @ClassName LWhFormProcureGoodsService
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index 9272b32..d0189f9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -11,7 +11,7 @@
/**
* @ClassName lWhFormProcureService
- * @Author cy
+
* @Date 2023/10/24
* @Description 閲囪喘鍗�
* @Version 1.0
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 d4b1cb4..fd78245 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
@@ -18,7 +18,7 @@
/**
* @ClassName LWhFormScrappedCoreService
- * @Author cy
+
* @Date 2023/10/30
* @Description
* @Version 1.0
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
index 72b3f04..4cb4faf 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
@@ -8,7 +8,7 @@
/**
* @ClassName LWhFormScrappedGoodsService
- * @Author cy
+
* @Date 2023/10/30
* @Description
* @Version 1.0
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 bc83a71..d3843d3 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,31 +1,56 @@
package com.consum.base.service;
+import com.consum.base.core.util.LockManage;
+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.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 javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @ClassName LWhFormTransferCoreService
- * @Author cy
+
* @Date 2023/10/26
* @Description
* @Version 1.0
**/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class)
public class LWhFormTransferCoreService {
@Resource
private LWhFormTransferServiceImpl lWhFormTransferService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
+ @Resource
+ private GoodsBaseServiceImpl goodsBaseService;
+ @Resource
+ private LWhGoodsRecordService lWhGoodsRecordService;
+ @Resource
+ private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LGoodsWhRecordServiceImpl lGoodsWhRecordService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
+ @Resource
+ private LWarehouseFlowService LWhGoodsRecordDetailsService;
/**
* 鎵ц璋冩嫧鍑哄簱鎿嶄綔
+ *
* @param whFormTransferId 璋冩嫧鍗昳d
*/
public void doTransferOutPut(Long whFormTransferId, S_user_core currentUser) {
@@ -50,7 +75,7 @@
return;
}
// 鍑哄簱鍗� 鍑哄簱锛岃繑鍥� 鍑哄簱鍗曟祦姘碔d
- Long outFormByTransId = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser, dealTime);
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);
// 鏇存柊璋冩嫧鍗�
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
@@ -59,8 +84,8 @@
lWhFormTransfer.setOutOperatorId(userId);
lWhFormTransfer.setOutOperatorName(nickName);
lWhFormTransfer.setOutputTime(dealTime);
+ lWhFormTransfer.setOutWarehouseFlowId(lWarehouseFlowId);
lWhFormTransferService.update(lWhFormTransfer);
-
log.info("璋冩嫧鍗曪細{} 鍑哄簱瀹屾垚", whFormTransferId);
return;
@@ -81,23 +106,98 @@
}
Long userId = currentUser.getId();
String nickName = currentUser.getNick_name();
+ // 鍑哄簱鍗曟祦姘磇d
+ Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
+ // 鍏ュ簱浠撳簱绫诲瀷 0鏈烘瀯1閮ㄩ棬
+ Integer inWarehouseType = lWhFormTransfer.getInWarehouseType();
+ Long inWarehouseId = lWhFormTransfer.getInWarehouseId();
+ String inWarehouseName = lWhFormTransfer.getInWarehouseName();
- // 鍑哄簱鍗旾D
- Long outWarehouseFormId = lWhFormTransfer.getOutWarehouseFormId();
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
// 娴佹按璁板綍鎬昏〃ID
- long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);
+ long inWarehouseFlowId = NumberGenerator.getLongSequenceNumber();
+ // 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
+ List<Long> outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId);
+
+ // 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW]
+ LWarehouseFlow inwarehouseFlow = new LWarehouseFlow();
+ inwarehouseFlow.setId(inWarehouseFlowId);
+ inwarehouseFlow.setWarehouseType(inWarehouseType);
+ inwarehouseFlow.setWarehouseId(inWarehouseId);
+ inwarehouseFlow.setWarehouseName(inWarehouseName);
+ inwarehouseFlow.setThisType(1);
+ inwarehouseFlow.setBusinessType(2);
+ inwarehouseFlow.setBusinessFormId(whFormTransferId);
+ inwarehouseFlow.setOperatorId(userId);
+ inwarehouseFlow.setOperatorName(nickName);
+ inwarehouseFlow.setDealTime(dealTime);
+ lWarehouseFlowService.insert(inwarehouseFlow);
+
+ LWhGoodsRecord lWhGoodsRecord = new LWhGoodsRecord();
+ lWhGoodsRecord.setWarehouseFlowId(outWarehouseFlowId);
+ List<LWhGoodsRecord> whGoodsRecordList = lWhGoodsRecordService.select(lWhGoodsRecord);
+ for (LWhGoodsRecord whGoodsRecord : whGoodsRecordList) {
+ Long oldRecordId = whGoodsRecord.getId();
+ Long baseGoodsModelsId = whGoodsRecord.getBaseGoodsModelsId();
+ whGoodsRecord.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecord.setWarehouseType(inWarehouseType);
+ whGoodsRecord.setWarehouseId(inWarehouseId);
+ whGoodsRecord.setDealTime(dealTime);
+ //閫氳繃LockManage鑾峰緱閿�
+ Object warehouseModelLockObj = LockManage.acquireLock(inWarehouseType, inWarehouseId, baseGoodsModelsId);
+ synchronized (warehouseModelLockObj) {
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, (short) 1, null);
+ whGoodsRecord.setInitialCount(goodsModelNum);
+ whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());
+ }
+ LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
+ lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
+ List<LWhGoodsRecordDetails> goodsRecordDetailsList = LWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
+ for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {
+ whGoodsRecordDetails.setId(NumberGenerator.getLongSequenceNumber());
+ whGoodsRecordDetails.setThisType(1);
+ }
+ LWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
+ }
+ lWhGoodsRecordService.insertBatch(whGoodsRecordList);
+
+ // 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛変腑 鐘舵�佽缃负1
+ lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, (short) 1);
+ //灏嗕繚绠′粨搴撲俊鎭洿鏂板埌 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆�
+ lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);
// 鏇存柊璋冩嫧鍗�
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
- lWhFormTransfer.setInWarehouseFormId(lWarehouseFlowId);
+ lWhFormTransfer.setInWarehouseFormId(inWarehouseFlowId);
lWhFormTransfer.setStates(2);
lWhFormTransfer.setInOperatorId(userId);
lWhFormTransfer.setInOperatorName(nickName);
lWhFormTransfer.setInTime(dealTime);
lWhFormTransferService.update(lWhFormTransfer);
-
log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
return;
}
+
+
+ private static String GET_GOODSID_BY_FLOWID = "SELECT goods.id FROM L_WH_GOODS_RECORD gr LEFT JOIN L_WH_GOODS_RECORD_DETAILS grd ON gr.id=grd.WH_GOODS_RECORD_ID LEFT JOIN L_WH_GOODS goods ON goods.id=grd.WH_GOODS_ID WHERE 1=1";
+
+ /**
+ * 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
+ *
+ * @param lWarehouseFlowId
+ */
+ private List<Long> getGoodsidByFlowId(long lWarehouseFlowId) {
+ StringBuilder sql = new StringBuilder(GET_GOODSID_BY_FLOWID);
+ Map<String, Object> paramts = new HashMap<>();
+ sql.append(" and gr.WAREHOUSE_FLOW_ID =:lWarehouseFlowId");
+ paramts.put("lWarehouseFlowId", lWarehouseFlowId);
+ List<Map<String, Object>> outGoods = goodsBaseService.select(sql.toString(), paramts);
+ if (CollectionUtils.isEmpty(outGoods)) {
+ return null;
+ }
+ List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ return whGoodsIds;
+ }
}
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
index 6925783..393a559 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
@@ -14,7 +14,7 @@
/**
* @ClassName LWhGoodsRecordDetailsService
- * @Author cy
+
* @Date 2023/10/31
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordService.java
index f0c9d1c..851b933 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordService.java
@@ -5,7 +5,7 @@
/**
* @ClassName LWhGoodsRecordService
- * @Author cy
+
* @Date 2023/10/27
* @Description
* @Version 1.0
@@ -13,4 +13,5 @@
@Service
public class LWhGoodsRecordService extends BaseServiceImpl {
+
}
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 495a2cf..2030a00 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
@@ -13,7 +13,7 @@
/**
* @ClassName LWhGoodsService
- * @Author cy
+
* @Date 2023/10/24
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
index 681001f..1c475e8 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
@@ -10,7 +10,7 @@
/**
* @ClassName LWhProcureModelService
- * @Author cy
+
* @Date 2023/10/24
* @Description
* @Version 1.0
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java
new file mode 100644
index 0000000..55baf6c
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserRecordServiceImpl.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName LWhProcureModelUserRecordServiceImpl
+
+ * @Date 2023/11/2
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhProcureModelUserRecordServiceImpl extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java b/consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java
index ba488ef..10e0cf9 100644
--- a/consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java
+++ b/consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java
@@ -7,7 +7,7 @@
//
///**
// * @ClassName RangeMergeUtil
-// * @Author cy
+//
// * @Date 2023/9/25
// * @Description
// * @Version 1.0
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java
index 9ae1cc4..e18d7e8 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java
@@ -24,6 +24,14 @@
@JsonIgnore
protected boolean isset_inWarehouseFormId = false;
+ private Long inWarehouseFlowId = null;
+ @JsonIgnore
+ protected boolean isset_inWarehouseFlowId = false;
+
+ private Long outWarehouseFlowId = null;
+ @JsonIgnore
+ protected boolean isset_outWarehouseFlowId = false;
+
private Long outWarehouseFormId = null;
@JsonIgnore
protected boolean isset_outWarehouseFormId = false;
@@ -179,6 +187,34 @@
@JsonIgnore
public boolean isEmptyInWarehouseFormId() {
return this.inWarehouseFormId == null;
+ }
+
+ public Long getInWarehouseFlowId() {
+ return this.inWarehouseFlowId;
+ }
+
+ public void setInWarehouseFlowId(Long inWarehouseFlowId) {
+ this.inWarehouseFlowId = inWarehouseFlowId;
+ this.isset_inWarehouseFlowId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInWarehouseFlowId() {
+ return this.inWarehouseFlowId == null;
+ }
+
+ public Long getOutWarehouseFlowId() {
+ return this.outWarehouseFlowId;
+ }
+
+ public void setOutWarehouseFlowId(Long outWarehouseFlowId) {
+ this.outWarehouseFlowId = outWarehouseFlowId;
+ this.isset_outWarehouseFlowId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutWarehouseFlowId() {
+ return this.outWarehouseFlowId == null;
}
public Long getOutWarehouseFormId() {
@@ -567,6 +603,8 @@
return new StringBuilder()
.append("id=").append(this.id)
.append("inWarehouseFormId=").append(this.inWarehouseFormId)
+ .append("inWarehouseFlowId=").append(this.inWarehouseFlowId)
+ .append("outWarehouseFlowId=").append(this.outWarehouseFlowId)
.append("outWarehouseFormId=").append(this.outWarehouseFormId)
.append("businessType=").append(this.businessType)
.append("businessFormCode=").append(this.businessFormCode)
@@ -614,6 +652,12 @@
if (this.isset_inWarehouseFormId) {
l_wh_form_transfer.setInWarehouseFormId(this.getInWarehouseFormId());
}
+ if (this.isset_inWarehouseFlowId) {
+ l_wh_form_transfer.setInWarehouseFlowId(this.getInWarehouseFlowId());
+ }
+ if (this.isset_outWarehouseFlowId) {
+ l_wh_form_transfer.setOutWarehouseFlowId(this.getOutWarehouseFlowId());
+ }
if (this.isset_outWarehouseFormId) {
l_wh_form_transfer.setOutWarehouseFormId(this.getOutWarehouseFormId());
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java
index 026243b..1fe00e4 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_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;
@@ -29,6 +27,8 @@
public static final String Id = "id";
// 鏅�氬睘鎬�
public static final String InWarehouseFormId = "in_warehouse_form_id";
+ public static final String InWarehouseFlowId = "in_warehouse_flow_id";
+ public static final String OutWarehouseFlowId = "out_warehouse_flow_id";
public static final String OutWarehouseFormId = "out_warehouse_form_id";
public static final String BusinessType = "business_type";
public static final String BusinessFormCode = "business_form_code";
@@ -71,6 +71,12 @@
//鏅�氬睘鎬�
if (lWhFormTransfer.isset_inWarehouseFormId) {
this.setInWarehouseFormId(lWhFormTransfer.getInWarehouseFormId());
+ }
+ if (lWhFormTransfer.isset_inWarehouseFlowId) {
+ this.setInWarehouseFlowId(lWhFormTransfer.getInWarehouseFlowId());
+ }
+ if (lWhFormTransfer.isset_outWarehouseFlowId) {
+ this.setOutWarehouseFlowId(lWhFormTransfer.getOutWarehouseFlowId());
}
if (lWhFormTransfer.isset_outWarehouseFormId) {
this.setOutWarehouseFormId(lWhFormTransfer.getOutWarehouseFormId());
@@ -197,6 +203,8 @@
InsertBuilder ib = new InsertBuilder(this.getTableName_());
ib.set(Id, this.getId());
ib.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ib.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ib.set(OutWarehouseFlowId, this.getOutWarehouseFlowId(), this.isset_outWarehouseFlowId);
ib.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
ib.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
@@ -234,6 +242,8 @@
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(OutWarehouseFlowId, this.getOutWarehouseFlowId(), this.isset_outWarehouseFlowId);
ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
@@ -272,6 +282,8 @@
public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(OutWarehouseFlowId, this.getOutWarehouseFlowId(), this.isset_outWarehouseFlowId);
ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
@@ -309,6 +321,8 @@
public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(OutWarehouseFlowId, this.getOutWarehouseFlowId(), this.isset_outWarehouseFlowId);
ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
@@ -383,7 +397,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, in_warehouse_form_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -391,7 +405,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, in_warehouse_form_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, in_warehouse_form_id, in_warehouse_flow_id, out_warehouse_flow_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_type, in_warehouse_id, in_warehouse_name, out_warehouse_type, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -436,6 +450,22 @@
l_wh_form_transfer.setInWarehouseFormId(rs.getLong(columnIndex));
}
}
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InWarehouseFlowId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInWarehouseFlowId(null);
+ } else {
+ l_wh_form_transfer.setInWarehouseFlowId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutWarehouseFlowId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutWarehouseFlowId(null);
+ } else {
+ l_wh_form_transfer.setOutWarehouseFlowId(rs.getLong(columnIndex));
+ }
+ }
columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutWarehouseFormId);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord.java
new file mode 100644
index 0000000..e7215c9
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord.java
@@ -0,0 +1,172 @@
+
+package com.consum.model.po;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.walker.jdbc.BasePo;
+
+/**
+ * 琛ㄥ悕:L_WH_PROCURE_MODEL_USER_RECORD *
+ * @author genrator
+ */
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class LWhProcureModelUserRecord extends BasePo<LWhProcureModelUserRecord> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ // 涓婚敭
+ private Long id = null;
+ @JsonIgnore
+ protected boolean isset_id = false;
+
+ // 灞炴�у垪琛�
+ private Long transBusinessId = null;
+ @JsonIgnore
+ protected boolean isset_transBusinessId = false;
+
+ private Long operatorId = null;
+ @JsonIgnore
+ protected boolean isset_operatorId = false;
+
+ private String operatorName = null;
+ @JsonIgnore
+ protected boolean isset_operatorName = false;
+
+ private Long dealTime = null;
+ @JsonIgnore
+ protected boolean isset_dealTime = false;
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhProcureModelUserRecord() {
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏋勯�犲璞�
+ */
+ public LWhProcureModelUserRecord(Long id) {
+ this.setId(id);
+ }
+
+ /**
+ * 璁剧疆涓婚敭鍊�
+ */
+ @Override
+ public void setPkValue(Object value) {
+ this.setId((Long) value);
+ }
+
+ public Long getId() {
+ return this.id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ this.isset_id = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyId() {
+ return this.id == null;
+ }
+
+ public Long getTransBusinessId() {
+ return this.transBusinessId;
+ }
+
+ public void setTransBusinessId(Long transBusinessId) {
+ this.transBusinessId = transBusinessId;
+ this.isset_transBusinessId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyTransBusinessId() {
+ return this.transBusinessId == null;
+ }
+
+ public Long getOperatorId() {
+ return this.operatorId;
+ }
+
+ public void setOperatorId(Long operatorId) {
+ this.operatorId = operatorId;
+ this.isset_operatorId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorId() {
+ return this.operatorId == null;
+ }
+
+ public String getOperatorName() {
+ return this.operatorName;
+ }
+
+ public void setOperatorName(String operatorName) {
+ this.operatorName = operatorName;
+ this.isset_operatorName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorName() {
+ return this.operatorName == null || this.operatorName.length() == 0;
+ }
+
+ public Long getDealTime() {
+ return this.dealTime;
+ }
+
+ public void setDealTime(Long dealTime) {
+ this.dealTime = dealTime;
+ this.isset_dealTime = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyDealTime() {
+ return this.dealTime == null;
+ }
+
+ /**
+ * 閲嶅啓 toString() 鏂规硶
+ */
+ @Override
+ public String toString() {
+ return new StringBuilder()
+ .append("id=").append(this.id)
+ .append("transBusinessId=").append(this.transBusinessId)
+ .append("operatorId=").append(this.operatorId)
+ .append("operatorName=").append(this.operatorName)
+ .append("dealTime=").append(this.dealTime)
+ .toString();
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhProcureModelUserRecord $clone() {
+ LWhProcureModelUserRecord l_wh_procure_model_user_record = new LWhProcureModelUserRecord();
+
+ // 鏁版嵁搴撳悕绉�
+ //l_wh_procure_model_user_record.setDatabaseName_(this.getDatabaseName_());
+
+ // 涓婚敭
+ if (this.isset_id) {
+ l_wh_procure_model_user_record.setId(this.getId());
+ }
+ // 鏅�氬睘鎬�
+ if (this.isset_transBusinessId) {
+ l_wh_procure_model_user_record.setTransBusinessId(this.getTransBusinessId());
+ }
+ if (this.isset_operatorId) {
+ l_wh_procure_model_user_record.setOperatorId(this.getOperatorId());
+ }
+ if (this.isset_operatorName) {
+ l_wh_procure_model_user_record.setOperatorName(this.getOperatorName());
+ }
+ if (this.isset_dealTime) {
+ l_wh_procure_model_user_record.setDealTime(this.getDealTime());
+ }
+ return l_wh_procure_model_user_record;
+ }
+}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord_mapper.java
new file mode 100644
index 0000000..8e715ae
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModelUserRecord_mapper.java
@@ -0,0 +1,269 @@
+package com.consum.model.po;
+
+import com.walker.jdbc.BaseMapper;
+import com.walker.jdbc.ResultSetUtils;
+import com.walker.jdbc.SqlAndParameters;
+import com.walker.jdbc.sqlgen.DeleteBuilder;
+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;
+import java.sql.SQLException;
+import java.util.Map;
+
+/**
+ * 琛ㄥ悕:L_WH_PROCURE_MODEL_USER_RECORD *
+ * @author genrator
+ */
+public class LWhProcureModelUserRecord_mapper extends LWhProcureModelUserRecord implements BaseMapper<LWhProcureModelUserRecord> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ public static final RowMapper<LWhProcureModelUserRecord> ROW_MAPPER = new LWhProcureModelUserRecordRowMapper();
+
+ // 涓婚敭
+ public static final String Id = "id";
+ // 鏅�氬睘鎬�
+ public static final String TransBusinessId = "trans_business_id";
+ public static final String OperatorId = "operator_id";
+ public static final String OperatorName = "operator_name";
+ public static final String DealTime = "deal_time";
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhProcureModelUserRecord_mapper(LWhProcureModelUserRecord lWhProcureModelUserRecord) {
+ if (lWhProcureModelUserRecord == null) {
+ throw new IllegalArgumentException("po鍙傛暟涓嶅厑璁镐负绌猴紒");
+ }
+ //涓婚敭
+ if (lWhProcureModelUserRecord.isset_id) {
+ this.setId(lWhProcureModelUserRecord.getId());
+ }
+ //鏅�氬睘鎬�
+ if (lWhProcureModelUserRecord.isset_transBusinessId) {
+ this.setTransBusinessId(lWhProcureModelUserRecord.getTransBusinessId());
+ }
+ if (lWhProcureModelUserRecord.isset_operatorId) {
+ this.setOperatorId(lWhProcureModelUserRecord.getOperatorId());
+ }
+ if (lWhProcureModelUserRecord.isset_operatorName) {
+ this.setOperatorName(lWhProcureModelUserRecord.getOperatorName());
+ }
+ if (lWhProcureModelUserRecord.isset_dealTime) {
+ this.setDealTime(lWhProcureModelUserRecord.getDealTime());
+ }
+ // 鍘绘帀锛�2022-09-07
+ // this.setDatabaseName_(l_wh_procure_model_user_record.getDatabaseName_());
+ }
+
+ /**
+ * 鑾峰彇琛ㄥ悕
+ */
+ @Override
+ public String getTableName_() {
+ String tableName = "l_wh_procure_model_user_record";
+ /**
+ if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
+ return this.getDatabaseName_() + "." + tableName;
+ } else {
+ return tableName;
+ }
+ */
+ return tableName;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍚嶇О
+ */
+ @Override
+ public String getPkName_() {
+ return Id;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍊�
+ */
+ @Override
+ public Object getPkValue_() {
+ return this.getId();
+ }
+
+ /**
+ * 鑾峰彇鎻掑叆璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getInsertSql_() {
+ InsertBuilder ib = new InsertBuilder(this.getTableName_());
+ ib.set(Id, this.getId());
+ ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ return ib.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.where(this.getPkName_(), this.getPkValue_());
+ return ub.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ return ub.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ return ub.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_() {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ db.where(this.getPkName_(), this.getPkValue_());
+ return db.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_(String where, Map<String, Object> parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getDeleteSql_(String where, Object[] parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍗曡鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSingleSql_() {
+ SelectBuilder sb = new SelectBuilder(this.getTableName_());
+ sb.where(this.getPkName_(), this.getPkValue_());
+ return sb.genMapSql();
+ }
+
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
+ return new SqlAndParameters<>("select id, trans_business_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
+ return new SqlAndParameters<>("select id, trans_business_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 灏唕esultset鐨勪竴琛岃浆鍖栦负po
+ */
+ @Override
+ public LWhProcureModelUserRecord mapRow(ResultSet rs, int i) throws SQLException {
+ return ROW_MAPPER.mapRow(rs, i);
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhProcureModelUserRecord toLWhProcureModelUserRecord() {
+ return super.$clone();
+ }
+}
+
+/**
+ * l_wh_procure_model_user_record RowMapper
+ *
+ * @author genrator
+ */
+class LWhProcureModelUserRecordRowMapper implements RowMapper<LWhProcureModelUserRecord> {
+
+ @Override
+ public LWhProcureModelUserRecord mapRow(ResultSet rs, int i) throws SQLException {
+ ResultSetUtils resultSetUtils = new ResultSetUtils();
+ LWhProcureModelUserRecord l_wh_procure_model_user_record = new LWhProcureModelUserRecord();
+ Integer columnIndex;
+ //涓婚敭
+ columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUserRecord_mapper.Id);
+ if (columnIndex > 0) {
+ l_wh_procure_model_user_record.setId(rs.getLong(columnIndex));
+ }
+ //鏅�氬睘鎬�
+ columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUserRecord_mapper.TransBusinessId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_procure_model_user_record.setTransBusinessId(null);
+ } else {
+ l_wh_procure_model_user_record.setTransBusinessId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUserRecord_mapper.OperatorId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_procure_model_user_record.setOperatorId(null);
+ } else {
+ l_wh_procure_model_user_record.setOperatorId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUserRecord_mapper.OperatorName);
+ if (columnIndex > 0) {
+ l_wh_procure_model_user_record.setOperatorName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhProcureModelUserRecord_mapper.DealTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_procure_model_user_record.setDealTime(null);
+ } else {
+ l_wh_procure_model_user_record.setDealTime(rs.getLong(columnIndex));
+ }
+ }
+ return l_wh_procure_model_user_record;
+ }
+}
--
Gitblit v1.9.1