From a6acf1f8924a8fabaa4b74f6771ddbe41ab6b204 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 20 十一月 2023 18:47:09 +0800
Subject: [PATCH] 盘点编辑
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index d7b2604..fc83d65 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -2,26 +2,34 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.utils.MapRowMapper;
-import com.consum.base.pojo.*;
import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.core.utils.MapRowMapper;
+import com.consum.base.pojo.LWhFormScrappedExtend;
+import com.consum.base.pojo.LWhFormScrappedGoodsParams;
+import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.SDictData;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
/**
* @Description 鎶ュ簾鍗�
@@ -30,6 +38,7 @@
*/
@Service
public class LWhFormScrappedServiceImpl extends BaseServiceImpl {
+
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
@@ -52,21 +61,21 @@
private static String QUERY_LIST = "SELECT * FROM l_wh_form_scrapped WHERE 1 = 1";
private static final String QUERY_BF_DETAIL_LIST = "select lwfs.BUSINESS_FORM_CODE,\n" +
- " lwfsg.GOODS_TEMPLATE_NAME,\n" +
- " lwfsg.BASE_GOODS_MODELS_NAME,\n" +
- " lwfsg.COUNTS,\n" +
- " lwfs.AGENCY_NAME,\n" +
- " lwfs,OPERATOR_NAME,\n" +
- " lwfs,DEAL_TIME\n" +
- "from l_wh_form_scrapped lwfs\n" +
- " inner join l_wh_form_scrapped_goods lwfsg on lwfs.ID = lwfsg.FORM_SCRAPPED_ID ";
+ " lwfsg.GOODS_TEMPLATE_NAME,\n" +
+ " lwfsg.BASE_GOODS_MODELS_NAME,\n" +
+ " lwfsg.COUNTS,\n" +
+ " lwfs.AGENCY_NAME,\n" +
+ " lwfs,OPERATOR_NAME,\n" +
+ " lwfs,DEAL_TIME\n" +
+ "from l_wh_form_scrapped lwfs\n" +
+ " inner join l_wh_form_scrapped_goods lwfsg on lwfs.ID = lwfsg.FORM_SCRAPPED_ID ";
/**
* 鏂板
*
* @param param
- * @param currentUser 褰撳墠鐧诲綍鐢ㄦ埛
- * @param sysInfo 褰撳墠鐧诲綍鐢ㄦ埛
+ * @param currentUser 褰撳墠鐧诲綍鐢ㄦ埛
+ * @param sysInfo 褰撳墠鐧诲綍鐢ㄦ埛
* @return
*/
//1.鏂板鎶ュ簾鍗�
@@ -125,15 +134,15 @@
//鑾峰彇鎶ュ簾鍘熷洜code
List<String> scrappedCodeList = scrappedGoodsParamList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
//鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
- List<S_dict_data> s_dict_dataList = this.sDictDataService.selectByScrappedCodeList(scrappedCodeList);
- Map<Long, String> scrappedNameMap = s_dict_dataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+ List<SDictData> SDictDataList = this.sDictDataService.selectByScrappedCodeList(scrappedCodeList);
+ Map<Long, String> scrappedNameMap = SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
List<LWhFormScrappedGoods> scrappedGoodsList = new ArrayList<>();
for (LWhFormScrappedGoodsParams params : scrappedGoodsParamList) {
LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
scrappedGoods.setId(IdUtil.generateId());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
if (params.getCounts() > goodsNum) {
log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
return 0;
@@ -175,7 +184,7 @@
}
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
@@ -189,15 +198,16 @@
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
- sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ sql.append(
+ " AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
//鏈烘瀯
sql.append(" and AGENCY_ID like :agencyId ");
- if (param.getAgencyId() != null){
- paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ if (param.getAgencyId() != null) {
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
} else {
- paramts.put("agencyId", sysInfo.getTenantId() + StringUtils.CHAR_PERCENT);
+ paramts.put("agencyId", sysInfo.getTenantId() + StringUtils.CHAR_PERCENT);
}
//鎶ュ簾鏃堕棿
if (param.getDealTimeStart() != null) {
@@ -215,7 +225,7 @@
}
/**
- * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
@@ -224,7 +234,7 @@
//1.鏌ヨ鎶ュ簾鍗�
LWhFormScrapped lWhFormScrapped = this.get(new LWhFormScrapped(id));
if (lWhFormScrapped != null) {
- BeanUtils.copyProperties(lWhFormScrapped,scrappedExtend);
+ BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
}
//2.鏌ヨ鎶ュ簾鍗�
List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
@@ -236,6 +246,7 @@
/**
* 鎶ュ簾鏄庣粏
+ *
* @param param
* @return
*/
@@ -288,7 +299,7 @@
/**
- * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
+ * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/11/2
*/
@@ -299,7 +310,7 @@
if (lWhFormScrapped != null) {
lWhFormScrapped.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
lWhFormScrapped.setOperatorName(sysInfo.getUserName());
- BeanUtils.copyProperties(lWhFormScrapped,scrappedExtend);
+ BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
}
//2.鏌ヨ鎶ュ簾鍗曠墿鍝�
List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
--
Gitblit v1.9.1