|
@@ -165,7 +165,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
|
|
|
item1.setSort(size.getNum());//获取序号
|
|
|
item1.setId(oConvertUtils.id());//获取到随机id
|
|
|
- SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item.getSyPreAssembledPackingListItemId());//获取预装箱单数据
|
|
|
+ SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item1.getSyPreAssembledPackingListItemId());//获取预装箱单数据
|
|
|
syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber));//新剩余数量=原剩余数量-装箱单新增数量
|
|
|
syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber).negate());
|
|
|
item1.setSalesman(syPreItem.getSalesman());//获取业务员
|
|
@@ -918,6 +918,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
text(mapList3,"销售发货单");
|
|
|
text(mapList5,"采购发票单");
|
|
|
|
|
|
+ /*if(true){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+*/
|
|
|
String recording=null;
|
|
|
if(main.getRecording()!=null){
|
|
|
String[] recordings=main.getRecording().split(",");
|