|
@@ -468,7 +468,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
|
|
|
lotattDTO.setLotatt14(stockForm.getOrderNo());
|
|
|
// 生成完全分配的库存
|
|
|
invLotLocIdService.initInv(STAGE01.toString(), codeSkuRelationshipVO.getSku(), Constant.CUSTOMER_ID, current.doubleValue(), lotattDTO, current);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
invLotLocIdService.initInv(STAGE01.toString(), codeSkuRelationshipVO.getSku(), Constant.CUSTOMER_ID, current.doubleValue(), lotattDTO, BigDecimal.ZERO);
|
|
|
}
|
|
|
} else {
|
|
@@ -478,7 +478,22 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return AjaxResult.success("操作成功");
|
|
|
+ // 验证入库单是否完全收货
|
|
|
+ String endMsg = "";
|
|
|
+ boolean con = true;
|
|
|
+ List<String> asnNo = stockForm.getAsnNo();
|
|
|
+ for (String s : asnNo) {
|
|
|
+ WmsDocAsnHeader wmsDocAsnHeader = wmsDocAsnHeaderMapper.selectWmsDocAsnHeaderByAsnNo(s);
|
|
|
+ if (!wmsDocAsnHeader.getAsnStatus().equals(Constant.ASN_STS.STS40.getValue())) {
|
|
|
+ endMsg = "入库单还未完全收货!";
|
|
|
+ con = false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (con) {
|
|
|
+ endMsg = "入库单已经完全收货!";
|
|
|
+ }
|
|
|
+ return AjaxResult.success("操作成功!" + endMsg);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -675,7 +690,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
|
|
|
// if (asnHeader != null && StringUtils.isNotEmpty(asnHeader.getAsnNo())) {
|
|
|
// asnNo = asnHeader.getAsnNo();
|
|
|
// }else {
|
|
|
- asnNo = idSequenceUtils.generateId("ASNNO");
|
|
|
+ asnNo = idSequenceUtils.generateId("ASNNO");
|
|
|
// }
|
|
|
String orderNo = "";
|
|
|
String orderName = "";
|