|
@@ -100,6 +100,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
|
|
|
item1.setSyOrderDataItemId(syItem.getSyOrderDataItemId());//获取到订单子表id
|
|
|
item1.setSalesman(syItem.getSalesman());//获取业务员
|
|
|
item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门
|
|
|
+ item1.setInventoryCode(syItem.getInventoryCcode());
|
|
|
syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
|
|
|
//原剩余数量-预装箱单装箱数量=新剩余数量
|
|
|
syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(item1.getTotal()));
|
|
@@ -328,13 +329,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
|
|
|
for(SyPreAssembledPackingListItem item :list){
|
|
|
sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getGroupId());//获取尺码信息
|
|
|
int row=0;
|
|
|
- String planSize="";//计划各尺码数量
|
|
|
+ /* String planSize="";//计划各尺码数量
|
|
|
for (SizeTable size : sizes){
|
|
|
planSize=planSize+size.getSize()+":"+size.getQuantity().intValue()+"+";
|
|
|
size.setNum(++row);
|
|
|
}
|
|
|
planSize=planSize.substring(0,planSize.length()-1);
|
|
|
- item.setPlanSize(planSize);
|
|
|
+ item.setPlanSize(planSize);*/
|
|
|
item.setSizeTables(sizes);
|
|
|
}
|
|
|
sizes=syPreAssembledPackingListItemMapper.querySizes(id,gqroupId);
|