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
6931912ff0
commit
a570b23244
6 changed files with 50 additions and 51 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. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java
  2. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java
  3. 31
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
  4. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java
  5. 49
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java
  6. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java
View File

@ -42,7 +42,7 @@ public class DeliverRequestDetailDO extends BaseDO {
/**
* 包装号
*/
@NotBlank
private String packingNumber;
/**
* 器具号
@ -51,14 +51,14 @@ public class DeliverRequestDetailDO extends BaseDO {
/**
* 批次
*/
@NotBlank
private String batch;
/**
* 库存状态
*
* 枚举 {@link TODO inventory_status 对应的类}
*/
@NotBlank
private String inventoryStatus;
/**
* 到货主代码
@ -67,7 +67,6 @@ public class DeliverRequestDetailDO extends BaseDO {
/**
* 到库位代码
*/
@NotBlank
private String toLocationCode;
/**
* 主表ID

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java
View File

@ -42,7 +42,6 @@ public class DeliverRequestMainDO extends BaseDO {
/**
* 客户月台代码
*/
@NotBlank
private String customerDockCode;
/**
* 承运商
@ -63,12 +62,11 @@ public class DeliverRequestMainDO extends BaseDO {
/**
* 从仓库代码
*/
@NotBlank
private String fromWarehouseCode;
/**
* 到仓库代码
*/
@NotBlank
private String toWarehouseCode;
/**
* 从库位类型范围
@ -117,7 +115,7 @@ public class DeliverRequestMainDO extends BaseDO {
/**
* 部门
*/
@NotBlank
private String departmentCode;
/**
* 状态

31
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
View File

@ -90,15 +90,14 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
@Override
public Long createDeliverRequestMain(DeliverRequestMainCreateReqVO createReqVO) {
// 插入
RequestsettingDO requestsettingDO = new RequestsettingDO();
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("DeliverRequest");
DeliverRequestMainDO deliverRequestMain = validatorToCreate(createReqVO,requestsettingDO);
//调用自动执行方法
if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMain.getStatus())) {
}
trendsApi.createTrends(requestsettingDO.getId(), "IssueRequest", "增加了发料申请", TrendsTypeEnum.CREATE);
trendsApi.createTrends(requestsettingDO.getId(), "DeliverRequest", "增加了制品上架申请", TrendsTypeEnum.CREATE);
return deliverRequestMain.getId();
}
private DeliverRequestMainDO validatorToCreate(DeliverRequestMainCreateReqVO createReqVO, RequestsettingDO requestsettingDO) {
@ -136,7 +135,6 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
deliverRequestMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
return deliverRequestMainDO;
}
private DeliverRequestDetailDO validateDetailMethod(DeliverRequestDetailDO deliverRequestDetailDO) {
@ -151,29 +149,32 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
Isqty(saleDetailDO.getShippedQty(), deliverRequestDetailDO.getQty(), saleDetailDO.getOrderQty(), deliverRequestDetailDO.getSoNumber(), deliverRequestDetailDO.getSoLine(), deliverRequestDetailDO.getItemCode());
}
return deliverRequestDetailDO;
}
@Override
public void updateDeliverRequestMain(DeliverRequestMainUpdateReqVO updateReqVO) {
RequestsettingDO requestsettingDO = new RequestsettingDO();
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("DeliverRequest");
// 校验存在
validateDeliverRequestMainExists(updateReqVO.getId());
// 更新
DeliverRequestMainDO deliverRequestMainDO = validatorToUpdate(updateReqVO, requestsettingDO);
DeliverRequestMainDO updateObj = DeliverRequestMainConvert.INSTANCE.convert(updateReqVO);
deliverRequestMainMapper.updateById(updateObj);
if(RequestStatusEnum.HANDLING.getCode().equals(deliverRequestMainDO.getStatus())) {
}
trendsApi.createTrends(requestsettingDO.getId(), "DeliverRequest", "增加了制品上架申请", TrendsTypeEnum.CREATE);
}
private DeliverRequestMainDO validatorToUpdate(DeliverRequestMainUpdateReqVO updateReqVO, RequestsettingDO requestsettingDO) {
BusinesstypeDO businesstypeDO = new BusinesstypeDO();
DeliverRequestMainDO deliverRequestMainDO = validateMainMethod(updateReqVO,businesstypeDO,requestsettingDO);
//子表校验
List<DeliverRequestDetailCreateReqVO> subList = updateReqVO.getSubList();
List<DeliverRequestDetailDO> subDOList = DeliverRequestDetailConvert.INSTANCE.convertList03(subList);
for (DeliverRequestDetailDO issueRequestDetailDO : subDOList) {
validateDetailMethod(issueRequestDetailDO);
if(subList!=null){
List<DeliverRequestDetailDO> subDOList = DeliverRequestDetailConvert.INSTANCE.convertList03(subList);
for (DeliverRequestDetailDO issueRequestDetailDO : subDOList) {
validateDetailMethod(issueRequestDetailDO);
deliverRequestDetailMapper.updateBatch(subDOList);
}
}
deliverRequestMainMapper.updateById(deliverRequestMainDO);
deliverRequestDetailMapper.updateBatch(subDOList);
return deliverRequestMainDO;
}
@ -298,7 +299,6 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
try{
Isuom(itembasicDO.getUom(),detailDo.getUom());
}catch (Exception ex) {
message.append(ex.getMessage()).append(",");
}
}catch (Exception ex) {
@ -306,12 +306,10 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
}
try{
SaleDetailDO saleDetailDO =validatorSale(detailDo.getSoNumber(),detailDo.getSoLine(),detailDo.getItemCode());
if(saleDetailDO!=null) {
try {
Isqty(saleDetailDO.getShippedQty(), detailDo.getQty(), saleDetailDO.getOrderQty(), detailDo.getSoNumber(), detailDo.getSoLine(), detailDo.getItemCode());
} catch (Exception ex) {
message.append(ex.getMessage()).append(",");
}
}
@ -337,7 +335,6 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
}
List<DeliverRequestImportErrorVO> errorList = new ArrayList<>();
datas.forEach(createReqVO -> {
BusinesstypeDO businesstypeDO = new BusinesstypeDO();
DeliverRequestMainDO mainDo = DeliverRequestMainConvert.INSTANCE.convert(createReqVO);
String messageMain = validateDeliverRequestMainImport(mainDo, businesstypeDO);
@ -347,7 +344,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
boolean flag = true;
for (DeliverRequestDetailDO detailDO : subDOList) {
String messageDetail = validateIssueRequestDetailImport(detailDO, mainDo, businesstypeDO);
if (!messageMain.isEmpty() || messageDetail.isEmpty()) {
if (!messageMain.isEmpty() || !messageDetail.isEmpty()) {
DeliverRequestImportErrorVO importErrorVO = DeliverRequestMainConvert.INSTANCE.convert(createReqVO, detailDO);
importErrorVO.setImportStatus("失败");
messageMain = messageMain + messageDetail;

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java
View File

@ -190,7 +190,6 @@ public class ProductputawayRequestMainServiceImpl implements ProductputawayReque
ProductputawayRequestMainDO productputawayRequestMainDO = validateMainMethod(updateReqVO,businesstypeDO,requestsettingDO);
//子表校验
List<ProductputawayRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
if(subList!=null) {
List<ProductputawayRequestDetailDO> subDOList = ProductputawayRequestDetailConvert.INSTANCE.convertList05(subList);
for (ProductputawayRequestDetailDO productputawayRequestDetailDO : subDOList) {

49
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java
View File

@ -14,11 +14,16 @@ import com.win.module.system.api.dict.dto.DictDataRespDTO;
import com.win.module.system.api.serialnumber.SerialNumberApi;
import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.issueRequest.vo.*;
import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailUpdateReqVO;
import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainUpdateReqVO;
import com.win.module.wms.controller.productscrapRequest.vo.*;
import com.win.module.wms.convert.issueRequest.IssueRequestDetailConvert;
import com.win.module.wms.convert.issueRequest.IssueRequestMainConvert;
import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert;
import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO;
import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
import com.win.module.wms.dal.mysql.productscrapRequest.*;
import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestDetailConvert;
import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestMainConvert;
@ -105,16 +110,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
@Resource
private RequestsettingService requestsettingService;
@Resource
private ShiftService shiftService;
@Resource
private SupplieritemService supplieritemService;
@Resource
private LocationService locationService;
@Override
public Long createProductscrapRequestMain(ProductscrapRequestMainCreateReqVO createReqVO) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ProductScrapRequest");
@ -167,7 +162,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
productscrapRequestMainDO.setDueTime(balance2.getExpireDate());
}
isqty(productscrapRequestDetailDO.getQty(), blance1.getQty());
}
private ProductscrapRequestMainDO validateMainMethod(ProductscrapRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) {
@ -197,13 +191,34 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
@Override
public void updateProductscrapRequestMain(ProductscrapRequestMainUpdateReqVO updateReqVO) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ProductPutawayRequest");
// 校验存在
validateProductscrapRequestMainExists(updateReqVO.getId());
// 更新
ProductscrapRequestMainDO updateObj = ProductscrapRequestMainConvert.INSTANCE.convert(updateReqVO);
productscrapRequestMainMapper.updateById(updateObj);
ProductscrapRequestMainDO productscrapRequestMainDO = validatorToUpdate(updateReqVO, requestsettingDO);
if(RequestStatusEnum.HANDLING.getCode().equals(productscrapRequestMainDO.getStatus())) {
}
trendsApi.createTrends(requestsettingDO.getId(), "ProductPutawayRequest", "增加了制品报废申请", TrendsTypeEnum.CREATE);
}
private ProductscrapRequestMainDO validatorToUpdate(ProductscrapRequestMainUpdateReqVO updateReqVO, RequestsettingDO requestsettingDO) {
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductPutawayRequest");
ProductscrapRequestMainDO productputawayRequestMainDO = validateMainMethod(updateReqVO,businesstypeDO,requestsettingDO);
//子表校验
List<ProductscrapRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
if(subList!=null) {
List<ProductscrapRequestDetailDO> subDOList = ProductscrapRequestDetailConvert.INSTANCE.convertList05(subList);
for (ProductscrapRequestDetailDO productscrapRequestDetailDO : subDOList) {
validateDetailMethod(productscrapRequestDetailDO, businesstypeDO, productputawayRequestMainDO);
}
productscrapRequestDetailMapper.updateBatch(subDOList);
}
productscrapRequestMainMapper.updateById(productputawayRequestMainDO);
return productputawayRequestMainDO;
}
@Override
public void deleteProductscrapRequestMain(Long id) {
// 校验存在
@ -214,9 +229,7 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
@Override
public PageResult<ProductscrapRequestMainDO> getProductscrapRequestMainSenior(CustomConditions conditions) {
return productscrapRequestMainMapper.selectSenior(conditions);
}
private void validateProductscrapRequestMainExists(Long id) {
@ -245,7 +258,7 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
return productscrapRequestMainMapper.selectList(exportReqVO);
}
private String validateIssueRequestMainImport(ProductscrapRequestMainDO mainDo, BusinesstypeDO businesstypeDO) {
private String validateProductscrapRequestMainImport(ProductscrapRequestMainDO mainDo, BusinesstypeDO businesstypeDO) {
StringBuilder message = new StringBuilder();
mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
mainDo.setRequestTime(LocalDateTime.now());
@ -258,7 +271,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
mainDo.setAutoExecute(requestsettingDO.getAutoExecute());
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
}
if (businesstypeDO == null) {
message.append("根据单据设置未查找到制品报废申请申请的相关业务类型");
} else {
@ -266,7 +278,6 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
mainDo.setFromLocationTypes(businesstypeDO.getInLocationTypes());
mainDo.setFromAreaCodes(businesstypeDO.getInAreaCodes());
}
return message.toString();
}
@ -375,7 +386,7 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
datas.forEach(createReqVO -> {
BusinesstypeDO businesstypeDO = businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ProductScrapRequest");
ProductscrapRequestMainDO mainDo = ProductscrapRequestMainConvert.INSTANCE.convert(createReqVO);
String messageMain = validateIssueRequestMainImport(mainDo, businesstypeDO);
String messageMain = validateProductscrapRequestMainImport(mainDo, businesstypeDO);
List<ProductscrapRequestDetailCreateReqVO> subList = createReqVO.getSubList();
List<ProductscrapRequestDetailDO> subDOList = ProductscrapRequestDetailConvert.INSTANCE.convertList03(subList);
// 是否有错误数据

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

@ -81,8 +81,6 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
@Resource
private SupplierService supplierService;
@Resource
private SupplieritemService supplieritemService;
@Resource
private RuleService ruleService;
@Resource
private SerialNumberApi serialNumberApi;
@ -99,10 +97,6 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
@Resource
private JobUtils jobUtils;
@Resource
private ShiftService shiftService;
@Resource
private PurchaseMainService purchaseMainService;
@Resource
private PurchasereceiptRecordMainService purchasereceiptRecordMainService;
@Resource
private PurchasereceiptRecordDetailService purchasereceiptRecordDetailService;
@ -411,6 +405,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
* @param mainDO 采购收货主
* @param detailDOList 采购收货子
*/
@Transactional
private void generateJob(PurchasereceiptRequestMainDO mainDO, List<PurchasereceiptRequestDetailDO> detailDOList) {
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("PurchaseReceiptRequest");

Write Preview
Loading…
Cancel
Save