|
@@ -925,7 +925,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
JSONObject map2=new JSONObject();//材料出库单
|
|
|
map2.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","rdrecord11","dnmaketime")));//单号
|
|
|
map2.put("DDATE",createDate);//日期(格式2015-01-01)
|
|
|
- map2.put("CHANDLER",createBy);//审核人
|
|
|
+ //map2.put("CHANDLER",createBy);//审核人
|
|
|
map2.put("CGLTYPE","委外订单");//出库类别
|
|
|
map2.put("CRDCODE","22");//暂时设置成默认 Rd_Style有相关数据
|
|
|
map2.put("CMAKER",createBy);//制单人
|
|
@@ -1241,7 +1241,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
isSucceed=result(main,resturn2,"材料出库单",((Map) mapList2.get(0)).get("CACCID").toString(),"2");//采购入库单
|
|
|
isSucceed(main,isSucceed);
|
|
|
this.purchaseWarehousingMapper.updateVoucherHistoryCNumber(org.jeecg.modules.system.util.oConvertUtils.maxNumber(resturn2.getJSONObject(0).get("U8ReceiptNo").toString()),"107");
|
|
|
- }else if(mapList2!=null&&mapList2.size()>0){
|
|
|
+ }else if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()==null){
|
|
|
JSONArray resturn7 = InterfaceConnUtils.doPost(mapList7,"purchasein_import");//采购入库单
|
|
|
isSucceed=result(main,resturn7,"印厂采购入库单",((Map) mapList.get(0)).get("CACCID").toString(),"7");//采购入库单
|
|
|
isSucceed(main,isSucceed);
|