|
|
@@ -962,9 +962,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
text(mapList2,"材料出库单");
|
|
|
text(mapList7,"印厂采购入库单");
|
|
|
}
|
|
|
- if(true){
|
|
|
+ /*if(true){
|
|
|
return null;
|
|
|
- }
|
|
|
+ }*/
|
|
|
String isSucceed=null;
|
|
|
/*if(mapList2!=null&&mapList2.size()>0&&main.getIsSucceed()!=null){//印花
|
|
|
JSONArray resturn2 = InterfaceConnUtils.doPost(mapList2,"materialout_import");//采购入库单
|
|
|
@@ -1273,6 +1273,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
//先插主表数据，然后根据主表id查询子表数据再添加
|
|
|
String sql ="select distinct \n" +
|
|
|
"a.id u8Id, \n" +
|
|
|
+ "a.ccode as documentNo,\n"+
|
|
|
"f.ID as fId, \n"+
|
|
|
"'1' as is_U8_Data, \n" +
|
|
|
"a.cMemo memo, \n" +
|
|
|
@@ -1312,12 +1313,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
for (JSONObject json : jsonObjects) {//子表
|
|
|
try{
|
|
|
SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);
|
|
|
- QueryWrapper<SyPackingListFabric> queryWrapperCount = new QueryWrapper<>();
|
|
|
+ /*QueryWrapper<SyPackingListFabric> queryWrapperCount = new QueryWrapper<>();
|
|
|
queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));//获取今天时间
|
|
|
queryWrapperCount.eq("is_U8_Data", "1");//判断为辅料的数据
|
|
|
queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
|
|
|
- String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成辅料单据号
|
|
|
- sy.setDocumentNo(dateNo);//单据号
|
|
|
+ String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成辅料单据号*/
|
|
|
+
|
|
|
+ sy.setDocumentNo(account+sy.getDocumentNo());//单据号
|
|
|
sy.setDataSource("2");//直接从u8拉取的数据
|
|
|
sy.setU8Id(account + sy.getU8Id());
|
|
|
sy.setId(sy.getU8Id());
|
|
|
@@ -1410,9 +1412,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
sy1.setSupplierCodeDyeingPlant(syShippingDetailsItem.getSupplierCode());//染厂编码
|
|
|
sy1.setSupplierDyeingPlant(syShippingDetailsItem.getSupplier());//染厂
|
|
|
}
|
|
|
- sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
|
|
|
sy1.setElementsId(elementsId);//申报要素id
|
|
|
+ sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
|
|
|
sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
|
|
|
+ sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplier());//供应商编码
|
|
|
+ sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//供应商
|
|
|
sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
|
|
|
sy1.setSyShippingDetailsItemId(syShippingDetailsItem.getId());//出运明细子表id
|
|
|
sy1.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
|
huxy