|
@@ -370,6 +370,14 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
itemMap.put("cFree9",setNull(mapPOPodetails.get("cFree9")));
|
|
|
itemMap.put("cFree10",setNull(mapPOPodetails.get("cFree10")));
|
|
|
}
|
|
|
+
|
|
|
+ //获取批次属性赋值
|
|
|
+ public void getcBatchProperty(Map<String,Object> itemMap,Map<String,Object> map){
|
|
|
+ itemMap.put("cBatchProperty1",map.get("cBatchProperty1"));//含税单价
|
|
|
+ itemMap.put("cBatchProperty8",map.get("cBatchProperty8"));//供应商
|
|
|
+ itemMap.put("cBatchProperty9",map.get("cBatchProperty9"));//订单号
|
|
|
+ }
|
|
|
+
|
|
|
public Object setNull(Object o){
|
|
|
if(o==null){
|
|
|
return "";
|
|
@@ -506,6 +514,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
List<Map<String,Object>> transVouchsList=new ArrayList<>();
|
|
|
if(rdRecords01List!=null&&rdRecords01List.size()>0){
|
|
|
Integer vI=1;
|
|
|
+ //循环入库单子表
|
|
|
for(Map<String,Object> recordsMap:rdRecords01List){
|
|
|
Map<String,Object> vouchsMap=new HashMap<>();
|
|
|
//获取下游委外订单行数据
|
|
@@ -522,6 +531,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
vouchsMap.put("iTVQuantity",recordsMap.get("iQuantity"));//数量
|
|
|
//获取自由项与自定义项
|
|
|
getcFree(vouchsMap,recordsMap);
|
|
|
+ //获取批次属性
|
|
|
+ getcBatchProperty(vouchsMap,recordsMap);
|
|
|
|
|
|
// vouchsMap.put("cFree1",recordsMap.get("cFree1"));//颜色
|
|
|
// vouchsMap.put("cFree2",recordsMap.get("cFree2"));//尺码
|
|
@@ -597,6 +608,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
RdRecord09Map.put("bredvouch",0);//红蓝标识
|
|
|
this.baseMapper.saveRdRecord09(RdRecord09Map);
|
|
|
if(transVouchsList!=null){
|
|
|
+ //循环调拨单子表
|
|
|
for(Map<String,Object> transVouchsMap:transVouchsList){
|
|
|
Map<String,Object> RdRecords09Map=new HashMap<>();
|
|
|
RdRecords09Map.put("cInvCode",transVouchsMap.get("cInvCode"));//存货编码
|
|
@@ -611,6 +623,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
RdRecords09Map.put("irowno",transVouchsMap.get("irowno"));//行号
|
|
|
//获取自由项与自定义项
|
|
|
getcFree(RdRecords09Map,transVouchsMap);
|
|
|
+ //获取批次属性
|
|
|
+ getcBatchProperty(RdRecords09Map,transVouchsMap);
|
|
|
this.baseMapper.saveRdRecords09(RdRecords09Map);
|
|
|
}
|
|
|
}
|
|
@@ -645,6 +659,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
|
|
|
RdRecords08Map.put("irowno",transVouchsMap.get("irowno"));//行号
|
|
|
//获取自由项与自定义项
|
|
|
getcFree(RdRecords08Map,transVouchsMap);
|
|
|
+ //获取批次属性
|
|
|
+ getcBatchProperty(RdRecords08Map,transVouchsMap);
|
|
|
this.baseMapper.saveRdRecords08(RdRecords08Map);
|
|
|
}
|
|
|
}
|