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

BUG修改

master
叶佳兴 2 years ago
parent
97952f02c8
commit
3e680dba9a
4 changed files with 20 additions and 30 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. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingMainBaseVO.java
  2. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java
  3. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java
  4. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingMainBaseVO.java
View File

@ -1,16 +1,11 @@
package com.win.module.wms.controller.demandforecasting.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
@ -20,7 +15,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@Data
public class DemandforecastingMainBaseVO {
@Schema(description = "id", example = "id")
private Long id;
@ -35,11 +29,9 @@ public class DemandforecastingMainBaseVO {
private LocalDateTime publishTime;
@Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "单据号不能为空")
private String number;
@Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "业务类型不能为空")
private String businessType;
@Schema(description = "备注")
@ -71,7 +63,6 @@ public class DemandforecastingMainBaseVO {
private String updater;
@Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否可用不能为空")
private String available;
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java
View File

@ -22,6 +22,7 @@ public interface PurchaseDetailMapper extends BaseMapperX<PurchaseDetailDO> {
default PageResult<PurchaseDetailDO> selectPage(PurchaseDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchaseDetailDO>()
.eq(PurchaseDetailDO::getMasterId,reqVO.getMasterId())
.eqIfPresent(PurchaseDetailDO::getLineNumber, reqVO.getLineNumber())
.eqIfPresent(PurchaseDetailDO::getErpLocationCode, reqVO.getErpLocationCode())
.eqIfPresent(PurchaseDetailDO::getProjectCode, reqVO.getProjectCode())

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java
View File

@ -17,7 +17,6 @@ import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingDeta
import com.win.module.wms.dal.dataobject.demandforecasting.DemandforecastingMainDO;
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.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
import com.win.module.wms.dal.mysql.demandforecasting.DemandforecastingDetailMapper;
@ -74,25 +73,23 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
@Override
public Long createDemandforecastingMain(DemandforecastingMainCreateReqVO createReqVO) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("Demandforecasting");
DemandforecastingMainDO demandforecastingMainDO = validatorToCreate(createReqVO);
//调用自动执行方法
if(RequestStatusEnum.HANDLING.getCode().equals(demandforecastingMainDO.getStatus())) {
}
trendsApi.createTrends(requestsettingDO.getId(), "Demandforecasting", "增加了要货预测", TrendsTypeEnum.CREATE);
trendsApi.createTrends(demandforecastingMainDO.getId(), "Demandforecasting", "增加了要货预测", TrendsTypeEnum.CREATE);
return demandforecastingMainDO.getId();
}
@Override
public void updateDemandforecastingMain(DemandforecastingMainUpdateReqVO updateReqVO) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("Demandforecasting");
// 校验存在
validateDemandforecastingMainExists(updateReqVO.getId());
DemandforecastingMainDO demandforecastingMainDO = validatorToUpdate(updateReqVO);
if(RequestStatusEnum.HANDLING.getCode().equals(demandforecastingMainDO.getStatus())) {
}
trendsApi.createTrends(requestsettingDO.getId(), "Demandforecasting", "修改了要货预测", TrendsTypeEnum.CREATE);
trendsApi.createTrends(demandforecastingMainDO.getId(), "Demandforecasting", "修改了要货预测", TrendsTypeEnum.CREATE);
}
@Override
@ -248,8 +245,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
//新增方法（主和子）
private DemandforecastingMainDO validatorToCreate(DemandforecastingMainCreateReqVO createReqVO) {
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("Demandforecasting");
DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(createReqVO,businesstypeDO);
DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(createReqVO);
//子表校验
List<DemandforecastingDetailCreateReqVO> subList = createReqVO.getSubList();
List<DemandforecastingDetailDO> subDOList = DemandforecastingDetailConvert.INSTANCE.convertList03(subList);
@ -269,8 +265,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
//修改方法（主和子）
private DemandforecastingMainDO validatorToUpdate(DemandforecastingMainUpdateReqVO updateReqVO) {
BusinesstypeDO businesstypeDO = new BusinesstypeDO();
DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(updateReqVO,businesstypeDO);
DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(updateReqVO);
//子表校验
List<DemandforecastingDetailUpdateReqVO> subList = updateReqVO.getSubList();
List<DemandforecastingDetailDO> subDOList = DemandforecastingDetailConvert.INSTANCE.convertList05(subList);
@ -283,7 +278,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
}
//校验主表公共方法(适用于新增/修改)
private DemandforecastingMainDO validateMainMethod(DemandforecastingMainBaseVO baseVO, BusinesstypeDO businesstypeDO){
private DemandforecastingMainDO validateMainMethod(DemandforecastingMainBaseVO baseVO){
DemandforecastingMainDO demandforecastingMainDO = DemandforecastingMainConvert.INSTANCE.convert(baseVO);
this.validatorSupplier(demandforecastingMainDO.getSupplierCode());
return demandforecastingMainDO;
@ -292,7 +287,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
//校验子表公共方法(适用于新增/修改)
private void validateDetailMethod(DemandforecastingMainDO demandforecastingMainDO,DemandforecastingDetailDO demandforecastingDetailDO) {
itembasicService.selectItembasic(demandforecastingDetailDO.getItemCode());
purchaseMainService.selectPurchaseDetailDoExist(demandforecastingDetailDO.getPoNumber(), demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode(), demandforecastingDetailDO.getPoLine());
purchaseMainService.selectPurchaseDetailDoExist(demandforecastingDetailDO.getNumber(), demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode(), demandforecastingDetailDO.getPoLine());
supplieritemService.selectSupplierItemExist(demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode());
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
View File

@ -29,6 +29,7 @@ import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.dataobject.shift.ShiftDO;
import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper;
import com.win.module.wms.dal.mysql.purchase.PurchaseMainMapper;
@ -49,6 +50,7 @@ import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.service.shift.ShiftService;
import com.win.module.wms.service.stdcostprice.StdcostpriceService;
import com.win.module.wms.service.supplier.SupplierService;
import com.win.module.wms.service.supplieritem.SupplieritemService;
import com.win.module.wms.util.JobUtils;
import org.apache.commons.lang3.StringUtils;
@ -109,7 +111,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
private PurchasePlanDetailMapper purchasePlanDetailMapper;
@Resource
private SerialNumberApi serialNumberApi;
@Resource
private SupplierService supplierService;
@Override
public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) {
@ -260,9 +263,9 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
return errorList;
}
//主表校验 校验供应商基础信息
private ShiftDO validatorShiftExist(String supplierCode) {
return shiftService.selectShiftExist(supplierCode);
//主表校验 校验班次基础信息
private SupplierDO validatorShiftExist(String supplierCode) {
return supplierService.selectSupplier(supplierCode);
}
//子表校验 校验供应商基础信息
@ -289,8 +292,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
//校验主表公共方法(适用于新增/修改)
private PurchaseMainDO validatorMainMethod(PurchaseMainBaseVO baseVO) {
PurchaseMainDO mainDo = PurchaseMainConvert.INSTANCE.convert(baseVO);
ShiftDO shiftDO = this.validatorShiftExist(mainDo.getSupplierCode());
if (shiftDO == null) {
SupplierDO supplierDO = this.validatorShiftExist(mainDo.getSupplierCode());
if (supplierDO == null) {
throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
}
mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
@ -334,6 +337,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
//子表校验
List<PurchaseDetailCreateReqVO> subList = createReqVO.getSubList();
List<PurchaseDetailDO> subDOList = PurchaseDetailConvert.INSTANCE.convertList03(subList);
purchaseMainMapper.insert(purchaseMainDO);
for (PurchaseDetailDO purchaseDetailDO : subDOList) {
validatorDetailMethod(purchaseDetailDO, purchaseMainDO);
purchaseDetailDO.setMasterId(purchaseMainDO.getId());
@ -347,7 +351,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
purchaseDetailDO.setAvailable("TRUE");
purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode());
}
purchaseMainMapper.insert(purchaseMainDO);
purchaseDetailMapper.insertBatch(subDOList);
return purchaseMainDO;
}

Write Preview
Loading…
Cancel
Save