From 7c40b902af2ae09b353525f913056d66af12caf1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:02:43 +0800
Subject: [PATCH] feat: 1.新增人员机构错误 2.修改使用人时设置可用数量 3.重复预警 4.部门物品退回时设置调拨单信息 5.统计报表删除一列
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 2
admin-web/src/views/statisticalreport/itemReport/index.vue | 12 +-
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 59 ++++++--------
consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java | 9 +
consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 3
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 26 +++---
consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java | 3
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 52 ++++--------
consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java | 56 +++++++++----
12 files changed, 117 insertions(+), 113 deletions(-)
diff --git a/admin-web/src/views/statisticalreport/itemReport/index.vue b/admin-web/src/views/statisticalreport/itemReport/index.vue
index b82ae8e..a9a2cd3 100644
--- a/admin-web/src/views/statisticalreport/itemReport/index.vue
+++ b/admin-web/src/views/statisticalreport/itemReport/index.vue
@@ -53,12 +53,12 @@
label="鎶ュ簾鏁�"
width="150">
</el-table-column>
- <el-table-column
- align="center"
- prop="diaoBoNum"
- label="璋冩嫧鏁�"
- width="150">
- </el-table-column>
+<!-- <el-table-column-->
+<!-- align="center"-->
+<!-- prop="diaoBoNum"-->
+<!-- label="璋冩嫧鏁�"-->
+<!-- width="150">-->
+<!-- </el-table-column>-->
<el-table-column
align="center"
prop="totalNum"
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 6a92d2c..d16b267 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -224,7 +224,7 @@
}
tenantUser.setUserPhone(encPhone);
// 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+// tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
this.finSysTenantUserService.insert(tenantUser);
// 鎻掑叆骞冲彴鐢ㄦ埛
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 10a7e4d..a193e7b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,25 +1,8 @@
package com.consum.base.controller;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
@@ -37,31 +20,31 @@
import com.consum.base.pojo.response.GoodsTemplateCountVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LGoodsUserRecordCoreService;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserService;
+import com.consum.base.service.*;
import com.consum.base.service.impl.LWhFormTransferCoreService;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description 璋冩嫧绠＄悊
@@ -402,6 +385,11 @@
lWhProcureModelUser.setNowUserPhone(item.getPhone());
lWhProcureModelUser.setNowUserName(item.getUserName());
lWhProcureModelUser.setGoodsNum(item.getCount());
+
+ // 璁剧疆涓�涓嬪湪鐢ㄦ暟閲�
+ Long oldProcureModelId = item.getOldProcureModelId();
+ LWhProcureModelUser oldInfo = lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
+ lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
procureModelUserList.add(lWhProcureModelUser);
}
@@ -457,6 +445,7 @@
List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());
recordUserInfoVO.setUseName(userInfo.getUseName());
recordUserInfoVO.setPhone(userInfo.getPhone());
recordUserInfoVO.setNum(userInfo.getNum());
diff --git a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
index 9223370..d0239ea 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
@@ -204,10 +204,13 @@
}
goodsBaseService.execBatchUpdate("update DEP_FORM_SCRAPPED_MODEL set TOTAL_AMOUNT=? where id=?", parameterList);
- //鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
+ //濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
List<Object[]> procureModelUserIdList = new ArrayList<>();
for (Map<String, Object> itemMap : bfModelList) {
Long procureModelUserId = Convert.toLong(itemMap.get("PROCURE_MODEL_USER_ID"));
+ if (procureModelUserId == null) {
+ continue;
+ }
Integer counts = Convert.toInt(itemMap.get("COUNTS"));
// StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT-").append(counts);
@@ -221,7 +224,9 @@
one[2] = counts;
procureModelUserIdList.add(one);
}
- goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0", procureModelUserIdList);
+ if (!CollectionUtils.isEmpty(procureModelUserIdList)) {
+ goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0", procureModelUserIdList);
+ }
//閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
diff --git a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
index 0248e3f..dc79300 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
@@ -1,26 +1,14 @@
package com.consum.base.core;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
+import cn.hutool.core.convert.Convert;
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.GoodsBaseServiceImpl;
import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhGoodsRecord;
@@ -28,9 +16,18 @@
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
-
-import cn.hutool.core.convert.Convert;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @ClassName DepFormScrappedCoreServiceImpl
@@ -138,7 +135,7 @@
// 鏍规嵁鍒嗗彂鍗曘�佸瀷鍙枫�佷娇鐢ㄤ汉淇℃伅鏌ヨ鐗╁搧淇℃伅
List<Map<String, Object>> scrappedGoodsList = lWhGoodsService.queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, (short) 2, counts);
if (CollectionUtils.isEmpty(scrappedGoodsList) || scrappedGoodsList.size() < counts) {
- log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
+ log.error("瑕侀��鍥炵殑鐗╁搧鏁伴噺涓嶈冻锛�");
// 鎵嬪姩鍥炴粴
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鎶ュ簾澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
@@ -210,6 +207,31 @@
}
goodsBaseService.execBatchUpdate("update DEP_FORM_SCRAPPED_MODEL set TOTAL_AMOUNT=? where id=?", parameterList);
+ //濡傛灉鏄疉绫荤墿鍝侊紝鍒欐洿鏂� 鍒嗗彂鐗╁搧浣跨敤浜恒�怢_WH_PROCURE_MODEL_USER銆� 涓� 鏍规嵁id 鏇存柊 鍦ㄧ敤鏁伴噺(USE_COUNT)
+ List<Object[]> procureModelUserIdList = new ArrayList<>();
+ for (Map<String, Object> itemMap : bfModelList) {
+ Long procureModelUserId = Convert.toLong(itemMap.get("PROCURE_MODEL_USER_ID"));
+ if (procureModelUserId==null){
+ continue;
+ }
+ Integer counts = Convert.toInt(itemMap.get("COUNTS"));
+
+// StringBuilder sb = new StringBuilder("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT-").append(counts);
+// sb.append(" where id=").append(procureModelUserId);
+// sb.append(" and USE_COUNT-").append(counts).append(" >=0");
+// goodsBaseService.update(sb.toString());
+
+ Object[] one = new Object[3];
+ one[0] = counts;
+ one[1] = procureModelUserId;
+ one[2] = counts;
+ procureModelUserIdList.add(one);
+ }
+ if (!CollectionUtils.isEmpty(procureModelUserIdList)) {
+ goodsBaseService.execBatchUpdate("update L_WH_PROCURE_MODEL_USER set USE_COUNT=USE_COUNT- ? where id= ? and USE_COUNT- ? >=0", procureModelUserIdList);
+ }
+
+
//閲囪喘銆佽皟鎷ㄣ�佸嚭搴撶瓑鐨勭墿鍝佸瀷鍙枫�怢_WH_PROCURE_MODEL銆戜腑 鏍规嵁璋冩嫧鍗�+鍨嬪彿 鏇存柊 鍦ㄧ敤鏁伴噺
List<Object[]> procureModelParameterList = new ArrayList<>();
for (Map.Entry<String, Integer> entry : procureModelMap.entrySet()) {
diff --git a/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
index 9e69d29..8588f4c 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
@@ -10,7 +10,8 @@
*/
@Data
public class RecordUserInfoVO {
-
+ //浠ュ墠鐨勮褰昳d
+ private Long oldProcureModelId;
// 浣跨敤浜�
private String useName;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java b/consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java
index 9075c9d..18871f9 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/dto/UseRecordDTO.java
@@ -34,4 +34,6 @@
private Long baseGoodsModelsId;
@JsonProperty("procureModelId")
private Long procureModelId;
+ // l_wh_procure_model_user琛ㄦ棫鏈夌殑id
+ private Long oldProcureModelId;
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java b/consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java
index af6a191..23424f0 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/request/ProcureModelInfoParam.java
@@ -10,6 +10,8 @@
*/
@Data
public class ProcureModelInfoParam {
+ // l_wh_procure_model_user琛ㄦ棫鏈夌殑id
+ private Long oldProcureModelId;
// 鍗曞彿id
private Long businessId;
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
index 84cc278..14636b1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
@@ -1,22 +1,20 @@
package com.consum.base.service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.LGoodsUserRecord;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
/**
* @ClassName LGoodsUserRecordCoreService
@@ -57,10 +55,10 @@
LWhFormTransfer whFormTransfer = goodsBaseService.get(new LWhFormTransfer(transBusinessId));
Integer inWarehouseType = whFormTransfer.getInWarehouseType();
Long inWarehouseId = whFormTransfer.getInWarehouseId();
- // 灏嗘墍鏈夌墿鍝佽缃负鏈垎鍙�
+ // 灏嗘墍鏈夊凡涓嬪彂鐗╁搧璁剧疆涓烘湭鍒嗗彂 濡傛灉鍙戠敓浜嗛��鍥烇紝姝ゆ椂鏁伴噺鍒欏皬浜庡垎鍙戞椂鐨勬暟閲�!
List<Long> srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(inWarehouseType, inWarehouseId,
- transBusinessId, null, null, null, null);
- lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
+ transBusinessId, null, null, (short)2, null);
+ lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 1);
// 鍒犻櫎璇ヨ皟鎷ㄥ崟鏃ф湁浣跨敤璁板綍
lGoodsUserRecordService.delete(new LGoodsUserRecord(), "where TRANS_BUSINESS_ID =" + transBusinessId,
new HashMap<>());
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index 4d1358b..c0c7a02 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -21,7 +21,6 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -141,7 +140,7 @@
}
// 4 棰勮
//褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- lWhWarningCoreService.updateKuCun((short) 0, warehouseId, new ArrayList<>(allChangModelList), null, DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+// lWhWarningCoreService.updateKuCun((short) 0, warehouseId, new ArrayList<>(allChangModelList), null, DateUtils.getDateTimeNumber(System.currentTimeMillis()));
return 1;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
index 4421704..080b514 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
@@ -6,10 +6,11 @@
import com.consum.base.service.LWhProcureModelUserService;
import com.google.common.collect.Lists;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.springframework.stereotype.Service;
/**
* @author asus
@@ -24,6 +25,7 @@
public List<UseRecordDTO> selectUseRecord(Long businessId) {
String sql = "SELECT\n"
+ "\tpmur.ID,\n"
+ + "\tpmu.id as oldProcureModelId,\n"
+ "\tpm.ID procureModelId,\n"
+ "\tpmur.DEAL_TIME updateTime,\n"
+ "\tpmur.OPERATOR_NAME updateUserName,\n"
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index 97871be..624c3ea 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -1,19 +1,5 @@
package com.consum.base.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.DepUsingFormBackCoreServiceImpl;
@@ -26,32 +12,27 @@
import com.consum.base.pojo.request.UsingFormBackGoodsInfo;
import com.consum.base.pojo.request.UsingFormBackParam;
import com.consum.base.pojo.request.baseGoodModel;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.UseInfo;
-import com.consum.base.pojo.response.UsingFormBackDetailListVO;
-import com.consum.base.pojo.response.UsingFormBackDetailVO;
-import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
-import com.consum.base.pojo.response.UsingFormBackModelInfo;
-import com.consum.base.pojo.response.UsingFormBackVO;
-import com.consum.base.service.BaseCategoryService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.UsingFormBackGoodsService;
-import com.consum.base.service.UsingFormBackModelService;
-import com.consum.base.service.UsingFormBackService;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.UsingFormBack;
-import com.consum.model.po.UsingFormBackGoods;
-import com.consum.model.po.UsingFormBackModel;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author asus
@@ -134,6 +115,9 @@
goods.setCategoryName(baseCategory.getCategoryName());
goods.setClassification(baseCategory.getClassification());
+ goods.setTransBusinessId(goodsInfo.getTransBusinessId());
+ goods.setBusinessFormCode(goodsInfo.getBusinessFormCode());
+
LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(goodsInfo.getTransBusinessId());
goods.setTransOutWarehouseType(lWhFormTransfer.getOutWarehouseType());
goods.setTransOutWarehouseId(lWhFormTransfer.getOutWarehouseId());
--
Gitblit v1.9.1