|
|
@@ -1377,7 +1377,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
mapItem6.put("CWHCODE",mapt.get("vencode"));//仓库编码
|
|
|
}*/
|
|
|
//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据 顺序---5
|
|
|
- if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&!orderDataItem.get("iSOsID").equals("")){
|
|
|
+ if (orderDataItem==null){
|
|
|
+ throw new JeecgBootException(mapt.get("account")+"账套的"+mapt.get("ordertype")+"子表未获取到数据");
|
|
|
+ }else if(orderDataItem.get("iSOsID")==null){
|
|
|
+ throw new JeecgBootException(mapt.get("account")+"的"+mapt.get("ordertype")+"子表的iSOsID为null");
|
|
|
+ }else{
|
|
|
Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
|
|
|
mapSort.put(item.getId(),orderDataItem2.get("irowno").toString());
|
|
|
mapItem3.put("ITAXUNITPRICE",orderDataItem2.get("iTaxUnitPrice"));//原币含税单价（如果传空，取来源单据）（以含税单价为准自动计算相关价格及金额）
|
|
|
@@ -1532,9 +1536,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
System.out.println("获取循环后当前是第几个账套\t"+mapt.get("account"));
|
|
|
}
|
|
|
text(mapList,mapt.get("ordertype")+"入库单");
|
|
|
- /*if(true){
|
|
|
- return null;
|
|
|
- }*/
|
|
|
String recording=null;
|
|
|
if(main.getRecording()!=null&&!main.getRecording().equals("")){
|
|
|
String[] recordings=main.getRecording().split(",");
|
huxy