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
d2a77ed0c0
commit
d00c4bc21c
2 changed files with 9 additions and 7 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/service/inspectRequest/InspectRequestMainServiceImpl.java
  2. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

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

@ -60,6 +60,7 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -131,6 +132,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
RequestStatusState requestStatusState = new RequestStatusState();
requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute());
mainDO.setStatus(requestStatusState.getState().getCode());
mainDO.setRequestTime(LocalDateTime.now());
inspectRequestMainMapper.insert(mainDO);
for (InspectRequestDetailDO detailDO : subDOList) {
detailDO.setNumber(number);

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java
View File

@ -168,13 +168,13 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
@Override
public PurchasePlanDetailDO selectPurchasePlan(String pnubmer, String psupplierCode, String ppoNumber, String ppoLine, String pitemCode) {
QueryWrapper<PurchasePlanMainDO> queryWrapperMain = new QueryWrapper();
QueryWrapper<PurchasePlanMainDO> queryWrapperMain = new QueryWrapper<>();
queryWrapperMain.eq("number", pnubmer);
queryWrapperMain.eq("supplier_code", psupplierCode);
PurchasePlanMainDO purchasePlanMainDO = purchasePlanMainMapper.selectOne(queryWrapperMain);
if (purchasePlanMainDO != null && "TRUE".equals(purchasePlanMainDO.getAvailable())) {
if (!PurchasePlanStatusEnum.CLOSED.getCode().equals(purchasePlanMainDO.getStatus())) {
QueryWrapper queryWrapperDetail = new QueryWrapper();
QueryWrapper<PurchasePlanDetailDO> queryWrapperDetail = new QueryWrapper<>();
queryWrapperDetail.eq("master_id", purchasePlanMainDO.getId());
queryWrapperDetail.eq("po_number", ppoNumber);
queryWrapperDetail.eq("po_line", ppoLine);
@ -271,7 +271,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
DictDataRespDTO uom = dictDataApi.selectDictTypeAndLabel(DictTypeConstants.UOM,detailDO.getUom());
detailDO.setUom(uom.getValue());
//选择已发布状态下订单号、订单行、零件号 判断订单类型
QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
purchaseDetailDOQueryWrapper.eq("number", detailDO.getPoNumber());
purchaseDetailDOQueryWrapper.eq("item_code", detailDO.getItemCode());
purchaseDetailDOQueryWrapper.eq("line_number ", detailDO.getPoLine());
@ -348,7 +348,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
for (PurchasePlanDetailDO purchasePlanDetailDO : subDOList) {
validatorDetailMethod(purchasePlanDetailDO, purchasePlanMainDO);
//选择已发布状态下订单号、订单行、零件号 判断订单类型
QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper();
QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
purchaseDetailDOQueryWrapper.eq("number", purchasePlanDetailDO.getPoNumber());
purchaseDetailDOQueryWrapper.eq("item_code", purchasePlanDetailDO.getItemCode());
purchaseDetailDOQueryWrapper.eq("line_number ", purchasePlanDetailDO.getPoLine());
@ -384,7 +384,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
validatorDetailMethod(purchasePlanDetailDO, purchasePlanMainDO);
}
purchasePlanMainMapper.updateById(purchasePlanMainDO);
if (subDOList != null && subDOList.size() > 0) {
if (subDOList != null && !subDOList.isEmpty()) {
purchasePlanDetailMapper.updateBatch(subDOList);
}
return purchasePlanMainDO;
@ -448,14 +448,14 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
@Override
@Transactional
public void updatePlanPurchaseShippedQty(String number, String poNumber, String poLine, String itemCode, BigDecimal shippedQty) {
QueryWrapper<PurchasePlanMainDO> purchasePlanMainDOQueryWrapper = new QueryWrapper();
QueryWrapper<PurchasePlanMainDO> purchasePlanMainDOQueryWrapper = new QueryWrapper<>();
purchasePlanMainDOQueryWrapper.eq("number", poNumber);
purchasePlanMainDOQueryWrapper.eq("status", PurchasePlanStatusEnum.ACCEPTED.getCode());
List<PurchasePlanMainDO> purchasePlanMainDOList = purchasePlanMainMapper.selectList(purchasePlanMainDOQueryWrapper);
if (purchasePlanMainDOList != null && !purchasePlanMainDOList.isEmpty()) {
for (PurchasePlanMainDO purchasePlanMainDO : purchasePlanMainDOList) {
int i = 0;
QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper();
QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper<>();
purchasePlanDetailDOQueryWrapper.eq("number", poNumber);
purchasePlanDetailDOQueryWrapper.eq("po_line", poLine);
purchasePlanDetailDOQueryWrapper.eq("item_code", itemCode);

Write Preview
Loading…
Cancel
Save