sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

需求：ECUP-404

deli_scp
赵雪冰 6 days ago
parent
3f7385e865
commit
8eee21f1fe
7 changed files with 92 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java
  2. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailRespVO.java
  3. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java
  4. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailRespVO.java
  5. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java
  6. 45
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java
  7. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java
View File

@ -157,6 +157,7 @@ public class PurchaseDetailController {
BeanUtil.copyProperties(purchaseMainDO, vo, options);
String defaultLocationCode = supplieritemService.getDefaultLocationCode(purchaseMainDO.getSupplierCode(), vo.getItemCode());
vo.setDefaultLocation(defaultLocationCode);
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
} else {
@ -219,6 +220,7 @@ public class PurchaseDetailController {
BeanUtil.copyProperties(purchaseMainDO, vo, options);
String defaultLocationCode = supplieritemService.getDefaultLocationCode(purchaseMainDO.getSupplierCode(), vo.getItemCode());
vo.setDefaultLocation(defaultLocationCode);
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
} else {

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailRespVO.java
View File

@ -128,5 +128,8 @@ public class PurchaseDetailRespVO extends PurchaseDetailBaseVO {
*/
private String itemDesc2;
/**
* 物料名称
*/
private String itemName;
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java
View File

@ -15,6 +15,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.purchasePlan.vo.*;
import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert;
import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestDetailDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO;
import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
@ -25,6 +26,7 @@ import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanDetailMapper;
import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanMainMapper;
import com.win.module.wms.dal.mysql.supplieruser.SupplierUserMapper;
import com.win.module.wms.enums.common.ConstantDataInfo;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.purchasePlan.PurchasePlanDetailService;
import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestDetailService;
import io.swagger.v3.oas.annotations.Operation;
@ -74,6 +76,9 @@ public class PurchasePlanDetailController {
@Resource
private SupplierdeliverRequestDetailService supplierdeliverRequestDetailService;
@Resource
private ItembasicService itembasicService;
@PostMapping("/create")
@Operation(summary = "创建要货计划子")
//@PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:create')")
@ -110,6 +115,9 @@ public class PurchasePlanDetailController {
Set<Long> masterIdSet = new HashSet<>();
Set<String> poNumberSet = new HashSet<>();
Set<String> ppNumberSet = new HashSet<>();
//物料信息
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(pageResult.getList().stream().map(PurchasePlanDetailDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
for(PurchasePlanDetailDO purchasePlanDetailDO:pageResult.getList()){
poNumber = purchasePlanDetailDO.getPoNumber();
poNumberSet.add(purchasePlanDetailDO.getPoNumber());
@ -158,6 +166,9 @@ public class PurchasePlanDetailController {
}
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
PurchasePlanMainDO purchasePlanMainDO = mainMap.get(vo.getMasterId());
if(purchasePlanMainDO != null){
purchasePlanMainDO.setId(null);
@ -249,6 +260,9 @@ public class PurchasePlanDetailController {
masterIdSet.add(purchasePlanDetailDO.getMasterId());
ppNumberSet.add(purchasePlanDetailDO.getNumber());
}
//物料信息
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(pageResult.getList().stream().map(PurchasePlanDetailDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
Map<Long, PurchasePlanMainDO> mainMap = purchasePlanMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
// List<PurchaseDetailDO> purchaseDetailDOS = new ArrayList<>();
@ -289,6 +303,9 @@ public class PurchasePlanDetailController {
}
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
PurchasePlanMainDO purchasePlanMainDO = mainMap.get(vo.getMasterId());
if(purchasePlanMainDO != null){
purchasePlanMainDO.setId(null);

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailRespVO.java
View File

@ -143,4 +143,16 @@ public class PurchasePlanDetailRespVO extends PurchasePlanDetailBaseVO {
* 订单类型
*/
private String orderType;
/**
* 物料描述1
*/
private String itemDesc1;
/**
* 物料描述2
*/
private String itemDesc2;
/**
* 物料名称
*/
private String itemName;
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java
View File

@ -11,13 +11,16 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.wms.controller.supplierdeliverRequest.vo.*;
import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestDetailConvert;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.packageunit.PackageunitDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO;
import com.win.module.wms.dal.mysql.packageunit.PackageunitMapper;
import com.win.module.wms.dal.mysql.supplierdeliverRequest.SupplierdeliverRequestMainMapper;
import com.win.module.wms.dal.mysql.supplieruser.SupplierUserMapper;
import com.win.module.wms.enums.common.ConstantDataInfo;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -32,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -54,6 +58,9 @@ public class SupplierdeliverRequestDetailController {
@Resource
private PackageunitMapper packageunitMapper;
@Resource
private ItembasicService itembasicService;
@PostMapping("/create")
@Operation(summary = "创建供应商发货申请子")
////@PreAuthorize("@ss.hasPermission('wms:supplierdeliver-request-detail:create')")
@ -90,11 +97,16 @@ public class SupplierdeliverRequestDetailController {
for (SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO : pageResult.getList()) {
masterIdSet.add(supplierdeliverRequestDetailDO.getMasterId());
}
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(pageResult.getList().stream().map(SupplierdeliverRequestDetailDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
Map<Long, SupplierdeliverRequestMainDO> mainMap = supplierdeliverRequestMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for (SupplierdeliverRequestDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = mainMap.get(vo.getMasterId());
if(supplierdeliverRequestMainDO != null){
supplierdeliverRequestMainDO.setId(null);
@ -142,11 +154,16 @@ public class SupplierdeliverRequestDetailController {
for (SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO : pageResult.getList()) {
masterIdSet.add(supplierdeliverRequestDetailDO.getMasterId());
}
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(pageResult.getList().stream().map(SupplierdeliverRequestDetailDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
Map<Long, SupplierdeliverRequestMainDO> mainMap = supplierdeliverRequestMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for (SupplierdeliverRequestDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = mainMap.get(vo.getMasterId());
if(supplierdeliverRequestMainDO != null){
supplierdeliverRequestMainDO.setId(null);

45
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java
View File

@ -17,12 +17,14 @@ import com.win.module.wms.convert.supplieritem.SupplieritemConvert;
import com.win.module.wms.dal.dataobject.customer.CustomerDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
import com.win.module.wms.dal.mysql.itembasic.ItembasicMapper;
import com.win.module.wms.dal.mysql.supplier.SupplierMapper;
import com.win.module.wms.dal.mysql.supplieruser.SupplierUserMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.common.ConstantDataInfo;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.supplieritem.SupplieritemService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -62,6 +64,9 @@ public class SupplieritemController {
private SupplierUserMapper supplierUserMapper;
@Resource
private ItembasicMapper itembasicMapper;
@Resource
private ItembasicService itembasicService;
@PostMapping("/create")
@Operation(summary = "创建供应商物料")
@ -281,8 +286,13 @@ public class SupplieritemController {
PageResult<SupplieritemDO> supplieritem = supplieritemService.selectItembasicTypeToSupplieritem(pageVO);
PageResult<SupplieritemRespVO> supplieritemRespVOPageResult = SupplieritemConvert.INSTANCE.convertPage(supplieritem);
if (supplieritemRespVOPageResult.getList().size() > 0) {
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(supplieritem.getList().stream().map(SupplieritemDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
for (SupplieritemRespVO supplieritemRespVO : supplieritemRespVOPageResult.getList()) {
SupplierDO supplierDO = supplierMapper.selectByCode(supplieritemRespVO.getSupplierCode());
supplieritemRespVO.setItemName(Optional.ofNullable(itembasicDOMap.get(supplieritemRespVO.getItemCode())).map(ItembasicDO::getName).orElse(""));
supplieritemRespVO.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(supplieritemRespVO.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
supplieritemRespVO.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(supplieritemRespVO.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
if (supplierDO != null) {
supplieritemRespVO.setCountry(supplierDO.getCountry());
supplieritemRespVO.setCity(supplierDO.getCity());
@ -305,20 +315,27 @@ public class SupplieritemController {
public CommonResult<PageResult<SupplieritemRespVO>> selectItembasicTypeToSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<SupplieritemDO> pageResult = supplieritemService.selectItembasicTypeToSupplieritemSenior(conditions);
PageResult<SupplieritemRespVO> result = SupplieritemConvert.INSTANCE.convertPage(pageResult);
for (SupplieritemRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
SupplierDO supplierDO = supplierMapper.selectByCode(vo.getSupplierCode());
if (supplierDO != null) {
vo.setCountry(supplierDO.getCountry());
vo.setCity(supplierDO.getCity());
vo.setPhone(supplierDO.getPhone());
vo.setFax(supplierDO.getFax());
vo.setPostId(supplierDO.getPostId());
vo.setContacts(supplierDO.getContacts());
vo.setEmail(supplierDO.getEmail());
vo.setBank(supplierDO.getBank());
vo.setCurrency(supplierDO.getCurrency());
vo.setTaxRate(supplierDO.getTaxRate());
if (pageResult.getList().size() > 0) {
List<ItembasicDO> itembasicDOList = itembasicService.selectItembasicByCodesAll(pageResult.getList().stream().map(SupplieritemDO::getItemCode).collect(Collectors.toSet()));
Map<String, ItembasicDO> itembasicDOMap = itembasicDOList.stream().collect(Collectors.toMap(ItembasicDO::getCode, e -> e));
for (SupplieritemRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
SupplierDO supplierDO = supplierMapper.selectByCode(vo.getSupplierCode());
vo.setItemName(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getName).orElse(""));
vo.setItemDesc1(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc1).orElse(""));
vo.setItemDesc2(Optional.ofNullable(itembasicDOMap.get(vo.getItemCode())).map(ItembasicDO::getDesc2).orElse(""));
if (supplierDO != null) {
vo.setCountry(supplierDO.getCountry());
vo.setCity(supplierDO.getCity());
vo.setPhone(supplierDO.getPhone());
vo.setFax(supplierDO.getFax());
vo.setPostId(supplierDO.getPostId());
vo.setContacts(supplierDO.getContacts());
vo.setEmail(supplierDO.getEmail());
vo.setBank(supplierDO.getBank());
vo.setCurrency(supplierDO.getCurrency());
vo.setTaxRate(supplierDO.getTaxRate());
}
}
}
return success(result);

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java
View File

@ -56,4 +56,13 @@ public class SupplieritemRespVO extends SupplieritemBaseVO {
@Schema(description = "税率")
private BigDecimal taxRate;
@Schema(description = "物料名称")
private String itemName;
@Schema(description = "物料描述1")
private String itemDesc1;
@Schema(description = "物料描述2")
private String itemDesc2;
}

Write Preview
Loading…
Cancel
Save