Commit c5a19854 by wangchunyang

导入部分问题修正

parent ab52550c
...@@ -506,7 +506,7 @@ export default { ...@@ -506,7 +506,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids const ids = row.id || this.ids
this.$modal.confirm('是否确认删除库存盘点编号为"' + ids + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除选中的盘点数据项?').then(function() {
return delStocktakes(ids) return delStocktakes(ids)
}).then(() => { }).then(() => {
this.getList() this.getList()
......
...@@ -176,6 +176,8 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService { ...@@ -176,6 +176,8 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService {
outboundOrders.setUpdateUserCode(updateUser); outboundOrders.setUpdateUserCode(updateUser);
outboundOrdersMapper.updateOutboundOrders(outboundOrders); outboundOrdersMapper.updateOutboundOrders(outboundOrders);
loadInventoryTOIdMap();
// 3. 执行库存扣减(无库位不足时扣有库位) // 3. 执行库存扣减(无库位不足时扣有库位)
this.deductInventory(outboundOrderItems, updateUser, updateTime); this.deductInventory(outboundOrderItems, updateUser, updateTime);
...@@ -625,6 +627,8 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService { ...@@ -625,6 +627,8 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService {
mainDO.setUpdateUserCode(operId); mainDO.setUpdateUserCode(operId);
mainDO.setSortNo(Optional.ofNullable(mainDO.getSortNo()).orElse(0L)); mainDO.setSortNo(Optional.ofNullable(mainDO.getSortNo()).orElse(0L));
mainDO.setIsImport(0L); mainDO.setIsImport(0L);
//添加日期
mainDO.setInboundDate(DateUtils.getNowDate());
// 明细校验 // 明细校验
for (int i = 0; i < voList.size(); i++) { for (int i = 0; i < voList.size(); i++) {
...@@ -645,6 +649,7 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService { ...@@ -645,6 +649,7 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService {
itemDO.setCreateUserCode(operId); itemDO.setCreateUserCode(operId);
itemDO.setSortNo(0L); itemDO.setSortNo(0L);
itemDO.setItemStatus(3L); // 设置为已出库状态 itemDO.setItemStatus(3L); // 设置为已出库状态
itemDO.setShippedAt(mainDO.getInboundDate()); //
// 物料SAP校验 // 物料SAP校验
String sapNo = vo.getSapNo() != null ? vo.getSapNo().trim() : ""; String sapNo = vo.getSapNo() != null ? vo.getSapNo().trim() : "";
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论