zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

跳过任务直接生成记录修改库存余额。

master
刘忱 2 years ago
parent
ab6146b00f
commit
c96803b9a8
8 changed files with 49 additions and 94 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. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java
  3. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java
  4. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java
  5. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  6. 46
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java
  7. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
  8. 23
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java
View File

@ -80,6 +80,9 @@ public class InspectRecordDetailBaseVO {
@Schema(description = "其他属性")
private String otherProperties;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java
View File

@ -140,6 +140,9 @@ public class PurchasereceiptRecordDetailBaseVO {
@Schema(description = "物品描述2")
private String itemDesc2;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java
View File

@ -1,14 +1,12 @@
package com.win.module.wms.controller.purchasereturnRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -74,6 +72,9 @@ public class PurchasereturnRecordDetailBaseVO {
@Schema(description = "金额")
private BigDecimal amount;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java
View File

@ -63,6 +63,9 @@ public class PutawayRecordDetailBaseVO {
@Schema(description = "到库区代码")
private String toAreaCode;
@Schema(description = "主表ID")
private Long masterId;
@Schema(description = "单据号")
private String number;

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
View File

@ -18,14 +18,10 @@ import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -47,6 +43,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
@ -115,6 +112,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
private ExpectoutService expectoutService;
@Resource
private ExpectinService expectinService;
@Resource
private InspectRecordMainService inspectRecordMainService;
@Override
@Transactional
@ -377,30 +376,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
* @param detailDOList 收货检验子
*/
private void generateJob(InspectRequestMainDO mainDO, List<InspectRequestDetailDO> detailDOList) {
//跳过任务直接生成记录
if("TRUE".equals(mainDO.getDirectCreateRecord())) {
InspectRecordMainCreateReqVO inspectRecordMainCreateReqVO = new InspectRecordMainCreateReqVO();
BeanUtils.copyProperties(mainDO, inspectRecordMainCreateReqVO);
inspectRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode());
inspectRecordMainCreateReqVO.setNumber(number);
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
inspectRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
inspectRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
inspectRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
inspectRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
inspectRecordMainCreateReqVO.setId(null);
inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO));
for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO();
BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO);
inspectRecordDetailCreateReqVO.setNumber(number);
inspectRecordDetailMapper.insert(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetailCreateReqVO));
}
return;
}
//检验不能跳过任务直接生成记录
List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);

46
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java
View File

@ -16,14 +16,10 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailCreateReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert;
import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert;
import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -49,6 +45,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.itempackaging.ItempackagingService;
import com.win.module.wms.service.jobsetting.JobsettingService;
import com.win.module.wms.service.purchase.PurchaseMainService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.service.shift.ShiftService;
@ -115,6 +112,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
private ExpectinService expectinService;
@Resource
private JobsettingService jobsettingService;
@Resource
private PurchasereceiptRecordMainService purchasereceiptRecordMainService;
@Override
@Transactional
@ -421,30 +420,21 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
* @param detailDOList 采购收货子
*/
private void generateJob(PurchasereceiptRequestMainDO mainDO, List<PurchasereceiptRequestDetailDO> detailDOList) {
//跳过任务直接生成记录
if("TRUE".equals(mainDO.getDirectCreateRecord())) {
PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO();
BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO);
purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode());
purchasereceiptRecordMainCreateReqVO.setNumber(number);
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptRecord");
purchasereceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
purchasereceiptRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
purchasereceiptRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
purchasereceiptRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
purchasereceiptRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
purchasereceiptRecordMainMapper.insert(PurchasereceiptRecordMainConvert.INSTANCE.convert(purchasereceiptRecordMainCreateReqVO));
for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) {
PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO();
BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO);
purchasereceiptRecordDetailCreateReqVO.setToLocationCode(purchasereceiptRequestDetailDO.getDefaultToLocationCode());
purchasereceiptRecordDetailCreateReqVO.setNumber(number);
purchasereceiptRecordDetailMapper.insert(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetailCreateReqVO));
}
return;
}
//采购收货不能跳过任务直接生成记录
// if("TRUE".equals(mainDO.getDirectCreateRecord())) {
// PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO();
// BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO);
// purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
// List<PurchasereceiptRecordDetailCreateReqVO> purchasereturnRecordDetailCreateReqVOList = new ArrayList<>();
// for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) {
// PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO();
// BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO);
// purchasereturnRecordDetailCreateReqVOList.add(purchasereceiptRecordDetailCreateReqVO);
// }
// purchasereceiptRecordMainCreateReqVO.setSubList(purchasereturnRecordDetailCreateReqVOList);
// purchasereceiptRecordMainService.createPurchasereceiptRecordMain(purchasereceiptRecordMainCreateReqVO);
// return;
// }
RuleRespVO ruleRespVO = ruleService.deliveryGoods(mainDO.getSupplierCode());
JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
Map<String, List<PurchasereceiptRequestDetailDO>> listMap = new HashMap<>();

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
View File

@ -17,8 +17,6 @@ import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecor
import com.win.module.wms.controller.purchasereturnRequest.vo.*;
import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert;
import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobMainConvert;
import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordDetailConvert;
import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordMainConvert;
import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestDetailConvert;
import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestMainConvert;
import com.win.module.wms.dal.dataobject.balance.BalanceDO;
@ -368,24 +366,14 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereturnRecordMainCreateReqVO purchasereturnRecordMainCreateReqVO = new PurchasereturnRecordMainCreateReqVO();
BeanUtils.copyProperties(mainDO, purchasereturnRecordMainCreateReqVO);
purchasereturnRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RETURN_RECORD.getCode());
purchasereturnRecordMainCreateReqVO.setNumber(number);
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord");
purchasereturnRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
purchasereturnRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
purchasereturnRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
purchasereturnRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
purchasereturnRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
purchasereturnRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
purchasereturnRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
purchasereturnRecordMainMapper.insert(PurchasereturnRecordMainConvert.INSTANCE.convert(purchasereturnRecordMainCreateReqVO));
List<PurchasereturnRecordDetailCreateReqVO> purchasereturnRecordDetailCreateReqVOList = new ArrayList<>();
for(PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) {
PurchasereturnRecordDetailCreateReqVO purchasereturnRecordDetailCreateReqVO = new PurchasereturnRecordDetailCreateReqVO();
BeanUtils.copyProperties(purchasereturnRequestDetailDO, purchasereturnRecordDetailCreateReqVO);
purchasereturnRecordDetailCreateReqVO.setNumber(number);
purchasereturnRecordDetailMapper.insert(PurchasereturnRecordDetailConvert.INSTANCE.convert(purchasereturnRecordDetailCreateReqVO));
purchasereturnRecordDetailCreateReqVOList.add(purchasereturnRecordDetailCreateReqVO);
}
purchasereturnRecordMainCreateReqVO.setSubList(purchasereturnRecordDetailCreateReqVOList);
purchasereturnRecordMainService.createPurchasereturnRecordMain(purchasereturnRecordMainCreateReqVO);
return;
}
PurchasereturnJobMainDO purchasereturnJobMainDO = PurchasereturnJobMainConvert.INSTANCE.convert(mainDO);

23
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java
View File

@ -17,8 +17,6 @@ import com.win.module.wms.controller.putawayRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert;
import com.win.module.wms.convert.putawayJob.PutawayJobMainConvert;
import com.win.module.wms.convert.putawayRecord.PutawayRecordDetailConvert;
import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert;
import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -47,6 +45,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.jobsetting.JobsettingService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchase.PurchaseMainService;
import com.win.module.wms.service.putawayRecord.PutawayRecordMainService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.util.JobUtils;
@ -109,6 +108,8 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
private RuleService ruleService;
@Resource
private JobsettingService jobsettingService;
@Resource
private PutawayRecordMainService putawayRecordMainService;
@Override
@Transactional
@ -324,24 +325,14 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
PutawayRecordMainCreateReqVO putawayRecordMainCreateReqVO = new PutawayRecordMainCreateReqVO();
BeanUtils.copyProperties(mainDO, putawayRecordMainCreateReqVO);
putawayRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode());
putawayRecordMainCreateReqVO.setNumber(number);
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord");
putawayRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
putawayRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
putawayRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes());
putawayRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType());
putawayRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType());
putawayRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
putawayRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes());
putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
List<PutawayRecordDetailCreateReqVO> putawayRecordDetailCreateReqVOList = new ArrayList<>();
for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
PutawayRecordDetailCreateReqVO putawayRecordDetailCreateReqVO = new PutawayRecordDetailCreateReqVO();
BeanUtils.copyProperties(putawayRequestDetailDO, putawayRecordDetailCreateReqVO);
putawayRecordDetailCreateReqVO.setNumber(number);
putawayRecordDetailMapper.insert(PutawayRecordDetailConvert.INSTANCE.convert(putawayRecordDetailCreateReqVO));
putawayRecordDetailCreateReqVOList.add(putawayRecordDetailCreateReqVO);
}
putawayRecordMainCreateReqVO.setSubList(putawayRecordDetailCreateReqVOList);
putawayRecordMainService.createPutawayRecordMain(putawayRecordMainCreateReqVO);
return;
}
List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();

Write Preview
Loading…
Cancel
Save