|
@@ -120,11 +120,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
entity.setDelFlag("0");//新增数据设置成未删除
|
|
entity.setDelFlag("0");//新增数据设置成未删除
|
|
//获取该发运明细子表数据,回写剩余数量
|
|
//获取该发运明细子表数据,回写剩余数量
|
|
SyShippingDetailsItem detailsItem=syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
|
|
SyShippingDetailsItem detailsItem=syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
|
|
- detailsItem.setIsReference(1);//修改成已被参照
|
|
|
|
|
|
+ //detailsItem.setIsReference(1);//修改成已被参照
|
|
//剩余数量-这次入库数量=新剩余数量
|
|
//剩余数量-这次入库数量=新剩余数量
|
|
detailsItem.setSurplusQuantity(detailsItem.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
|
|
detailsItem.setSurplusQuantity(detailsItem.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
|
|
//此次入库数量-剩余数量=超发数量
|
|
//此次入库数量-剩余数量=超发数量
|
|
detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
|
|
detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
|
|
|
|
+ detailsItem.setIsReference(2);//面辅料回写
|
|
entity.setSalesman(detailsItem.getSalesman());//获取业务员
|
|
entity.setSalesman(detailsItem.getSalesman());//获取业务员
|
|
entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
|
|
entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
|
|
entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
|
|
entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
|
|
@@ -391,7 +392,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
}
|
|
}
|
|
|
|
|
|
/***
|
|
/***
|
|
- *
|
|
|
|
|
|
+ * 云工厂
|
|
* @param syPackingListTailorings
|
|
* @param syPackingListTailorings
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@@ -478,7 +479,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
item.setExcessQuantity(s1.getActualDeclaredQuantity().subtract(item.getSurplusQuantity()));
|
|
item.setExcessQuantity(s1.getActualDeclaredQuantity().subtract(item.getSurplusQuantity()));
|
|
item.setSurplusQuantity(item.getSurplusQuantity().subtract(s1.getActualDeclaredQuantity()));
|
|
item.setSurplusQuantity(item.getSurplusQuantity().subtract(s1.getActualDeclaredQuantity()));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ item.setIsReference(2);
|
|
syShippingDetailsItemMapper.updateById(item);
|
|
syShippingDetailsItemMapper.updateById(item);
|
|
}else{
|
|
}else{
|
|
throw new JeecgBootException("出运明细未找到对应数据");
|
|
throw new JeecgBootException("出运明细未找到对应数据");
|
|
@@ -581,6 +582,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
item.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()).intValue());//剩余数量
|
|
item.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()).intValue());//剩余数量
|
|
syShippingDetailsItem.setExcessQuantity(item.getActualDeclaredQuantity().subtract(syShippingDetailsItem.getSurplusQuantity()));
|
|
syShippingDetailsItem.setExcessQuantity(item.getActualDeclaredQuantity().subtract(syShippingDetailsItem.getSurplusQuantity()));
|
|
syShippingDetailsItem.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()));
|
|
syShippingDetailsItem.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()));
|
|
|
|
+ syShippingDetailsItem.setIsReference(2);//回写
|
|
syShippingDetailsItemMapper.updateById(syShippingDetailsItem);
|
|
syShippingDetailsItemMapper.updateById(syShippingDetailsItem);
|
|
}
|
|
}
|
|
syPackingListFabricItemMapper.insert(item);
|
|
syPackingListFabricItemMapper.insert(item);
|
|
@@ -1564,6 +1566,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
|
|
|
items.add(sy1);
|
|
items.add(sy1);
|
|
syShippingDetailsItem.setIsPull("2");//拉取成功
|
|
syShippingDetailsItem.setIsPull("2");//拉取成功
|
|
|
|
+ syShippingDetailsItem.setIsReference(2);//回写
|
|
syShippingDetailsItemMapper.updateById(syShippingDetailsItem);//修改
|
|
syShippingDetailsItemMapper.updateById(syShippingDetailsItem);//修改
|
|
}
|
|
}
|
|
else{
|
|
else{
|