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
chenfang 2 years ago
parent
fcdb960b5b
commit
913100941d
7 changed files with 83 additions and 64 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. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java
  3. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java
  4. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
  5. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java
  6. 26
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java
  7. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java
View File

@ -681,18 +681,19 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
//查询出已经退货完的记录主表下的子表数据
BigDecimal qty = BigDecimal.ZERO;
for (CustomerreturnRecordDetailDO customerreturnRecordDetailDO : customerreturnRecordDetailDOS) {
//校验"当前客户退货记录子表"物品与"客户退货申请子表"物品是否一致
if (deliver.getItemCode().equals(detailDO.getItemCode()) && deliver.getBatch().equals(detailDO.getBatch())
&& deliver.getPackingNumber().equals(detailDO.getPackingNumber())) {
//校验"当前客户退货记录子表"物品与"数据库里已退货的客户退货记录子表"物品是否一致
if (deliver.getItemCode().equals(customerreturnRecordDetailDO.getItemCode()) && deliver.getBatch().equals(customerreturnRecordDetailDO.getFromBatch())
&& deliver.getPackingNumber().equals(customerreturnRecordDetailDO.getFromPackingNumber())) {
hashMap.put(detailDO.getId(), qty = qty.add(customerreturnRecordDetailDO.getQty()));
}
}
}
if (hashMap.get(detailDO.getId()) != null) {
if (deliver.getQty().compareTo((hashMap.get(detailDO.getId())).add(detailDO.getQty())) == -1) {
throw exception(QTY_EXCEPTION, "当前客户退货申请单的" + detailDO.getId() + "的退货数量已超出当前发货记录的发货数量" + (hashMap.get(detailDO.getId())).add(detailDO.getQty()).subtract(deliver.getQty()) + "个");
throw exception(QTY_EXCEPTION, "当前客户退货申请单【" + detailDO.getId() + "的该物品" + detailDO.getItemCode() + "】已全部退货，超出当前发货记录的发货数量" + (hashMap.get(detailDO.getId())).add(detailDO.getQty()).subtract(deliver.getQty()) + "个");
}
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java
View File

@ -272,7 +272,7 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
//创建客户收货记录主表
DeliverRecordMainDO deliverRecordMainDO = new DeliverRecordMainDO();
BeanUtils.copyProperties(deliverJobMainDO, deliverRecordMainDO);
String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_JOB.getCode());
String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_RECORD.getCode());
deliverRecordMainDO.setNumber(number);
deliverRecordMainDO.setJobNumber(deliverJobMainDO.getNumber());
deliverRecordMainDO.setId(null);

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

@ -48,7 +48,6 @@ import com.win.module.wms.service.customer.CustomerService;
import com.win.module.wms.service.customerdock.CustomerdockService;
import com.win.module.wms.service.deliverJob.DeliverJobMainService;
import com.win.module.wms.service.deliverPlan.DeliverPlanDetailService;
import com.win.module.wms.service.deliverPlan.DeliverPlanMainService;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.jobsetting.JobsettingService;

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
View File

@ -260,32 +260,34 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
if ("HoldToOk".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord");
} else if ("OkToHold".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRecord");
} else if ("HoldToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRecord");
} else if ("ScrapToHold".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRecord");
} else if ("OkToScrap".equals(inventorymoveRecordMainDO.getBusinessType())) {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord");
}else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord");
}
inventorymoveRecordMainDO.setNumber(number);
if(businesstypeDO != null){
inventorymoveRecordMainDO.setBusinessType(businesstypeDO.getCode());
inventorymoveRecordMainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
inventorymoveRecordMainDO.setInTransactionType(businesstypeDO.getInTransactionType());
}
inventorymoveRecordMainDO.setInterfaceType(recordsettingDO.getInterfaceType());
inventorymoveRecordMainMapper.insert(inventorymoveRecordMainDO);
List<InventorymoveJobDetailUpdateReqVO> inventorymoveJobDetailUpdateReqVOList = inventorymoveJobMainUpdateReqVO.getSubList();

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java
View File

@ -81,41 +81,43 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa
// 插入
InventorymoveRecordMainDO mainDO = InventorymoveRecordMainConvert.INSTANCE.convert(createReqVO);
List<InventorymoveRecordDetailDO> subDOList = InventorymoveRecordMainConvert.INSTANCE.convertList03(createReqVO.getSubList());
if("HoldToOkRecord".equals(mainDO.getBusinessType())){
if("HoldToOk".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
} else if("OkToHoldRecord".equals(mainDO.getBusinessType())){
} else if("OkToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord");
} else if("HoldToScrapRecord".equals(mainDO.getBusinessType())){
} else if("HoldToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord");
} else if("ScrapToHoldRecord".equals(mainDO.getBusinessType())){
} else if("ScrapToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord");
} else if("OkToScrapRecord".equals(mainDO.getBusinessType())){
} else if("OkToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord");
}else if("InventoryMoveRecord".equals(mainDO.getBusinessType())){
}else if("Move".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode());
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("InventoryMoveRecord");
recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
}
mainDO.setNumber(number);
if(businesstypeDO != null){
mainDO.setBusinessType(businesstypeDO.getCode());
mainDO.setInterfaceType(recordsettingDO.getInterfaceType());
mainDO.setCreator(createReqVO.getCreator());
mainDO.setOutTransactionType(businesstypeDO.getOutTransactionType());
mainDO.setInTransactionType(businesstypeDO.getInTransactionType());
mainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes());
mainDO.setToLocationTypes(businesstypeDO.getInLocationTypes());
mainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
mainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
}
mainDO.setInterfaceType(recordsettingDO.getInterfaceType());
mainDO.setCreator(createReqVO.getCreator());
AdminUserRespDTO user = userApi.getUser(Long.valueOf(createReqVO.getCreator()));
mainDO.setDepartmentCode(user.getDeptId().toString());
mainDO.setExecuteTime(LocalDateTime.now());
@ -145,10 +147,12 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa
TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut);
//增加业务出类型
if(businesstypeDO != null){
transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
}
transactionCreateReqVOOut.setRecordNumber(number);
transactionCreateReqVOOut.setInventoryStatus(detailDO.getFromInventoryStatus());
transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId()));
@ -159,6 +163,7 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa
transactionCreateReqVOOut.setAmount(BigDecimal.ZERO);
transactionCreateReqVOOut.setId(null);
transactionCreateReqVOList.add(transactionCreateReqVOOut);
if(businesstypeDO != null){
//判断businesstypeDO.getInTransactionType()是否为空，不为空时增加入库存事务
if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) {
//增加业务入类型
@ -179,6 +184,7 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa
transactionCreateReqVOList.add(transactionCreateReqVOIn);
}
}
}
inventorymoveRecordDetailMapper.insertBatch(subDOList);
//增加库存事务
transactionService.createTransaction(transactionCreateReqVOList);

26
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java
View File

@ -578,27 +578,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
if("HoldToOk".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToOkRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRecord");
} else if("OkToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRecord");
} else if("HoldToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("HoldToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRecord");
} else if("ScrapToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("ScrapToHoldRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRecord");
} else if("OkToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("OkToScrapRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord");
}else {
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode());
recordsettingDO = recordsettingService.selectRecordsettingExist("MoveRecord");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord");
}
inventorymoveRecordMainCreateReqVO.setNumber(number);
inventorymoveRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
@ -638,27 +638,27 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
if("HoldToOk".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_OK_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("HoldToOkJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOkJob");
} else if("OkToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("OkToHoldJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldJob");
} else if("HoldToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("HoldToScrapJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapJob");
} else if("ScrapToHold".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("ScrapToHoldJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldJob");
} else if("OkToScrap".equals(mainDO.getBusinessType())){
number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("OkToScrapJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapJob");
}else {
number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_JOB.getCode());
jobsettingDO = jobsettingService.selectJobsettingExist("MoveJob");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("MoveRequest");
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveJob");
}
inventorymoveJobMainDO.setNumber(number);
inventorymoveJobMainDO.setRequestTime(mainDO.getRequestTime());
@ -681,9 +681,11 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
inventorymoveJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
inventorymoveJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
//增加业务类型
if(businesstypeDO != null){
inventorymoveJobMainDO.setBusinessType(businesstypeDO.getCode());
inventorymoveJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
inventorymoveJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
}
inventorymoveJobMainMapper.insert(inventorymoveJobMainDO);
List<ExpectoutCreateReqVO> expectpoutCreateReqVOList = new ArrayList<>();
List<ExpectinCreateReqVO> expectpinCreateReqVOList = new ArrayList<>();

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
View File

@ -190,6 +190,15 @@ public class JobUtils {
return result;
}
public void demo(String pcode){
BusinesstypeDO businesstypeDO = selectDocumentSettingFromBusinessType(pcode);
String inLocationTypes = businesstypeDO.getInLocationTypes();
String[] split = inLocationTypes.split(",");
ArrayList<BalanceDO> balanceDOArrayList = new ArrayList<>();
for (String s : split) {
// balanceService.getBalancePage()
}
}
/**
* 更新发货计划的已发货数量

Write Preview
Loading…
Cancel
Save