|
@@ -1566,7 +1566,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
|
|
|
//@Override
|
|
//@Override
|
|
//@Transactional
|
|
//@Transactional
|
|
- //@Scheduled(fixedRate=1000*60*3)
|
|
|
|
|
|
+ @Scheduled(fixedRate=1000*60*30)
|
|
public void getU8Data (){
|
|
public void getU8Data (){
|
|
try {
|
|
try {
|
|
SimpleDateFormat sf = new SimpleDateFormat("yyMMdd");
|
|
SimpleDateFormat sf = new SimpleDateFormat("yyMMdd");
|
|
@@ -1582,6 +1582,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
maps.get(account).add(id);
|
|
maps.get(account).add(id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ System.out.println("");
|
|
for (String account : maps.keySet()) {//分成两类数据
|
|
for (String account : maps.keySet()) {//分成两类数据
|
|
//先插主表数据,然后根据主表id查询子表数据再添加
|
|
//先插主表数据,然后根据主表id查询子表数据再添加
|
|
String sql ="select \n" +
|
|
String sql ="select \n" +
|
|
@@ -1634,13 +1635,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
sy.setU8Id(account + sy.getU8Id());
|
|
sy.setU8Id(account + sy.getU8Id());
|
|
sy.setId(sy.getU8Id());
|
|
sy.setId(sy.getU8Id());
|
|
// sy.setGarmentFactory(maps3.get(sy.getId()));//获取成衣工厂
|
|
// sy.setGarmentFactory(maps3.get(sy.getId()));//获取成衣工厂
|
|
- syPackingListFabricMapper.insert(sy);//添加数据
|
|
|
|
|
|
+ // syPackingListFabricMapper.insert(sy);//添加数据
|
|
String sql2 = "select " +
|
|
String sql2 = "select " +
|
|
"b.AutoID as u8id ,\n" +
|
|
"b.AutoID as u8id ,\n" +
|
|
"b.id as u8pid,\n" +
|
|
"b.id as u8pid,\n" +
|
|
"b.id as syPackingListFabricId,\n" +
|
|
"b.id as syPackingListFabricId,\n" +
|
|
"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
|
|
"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
|
|
"b.csocode as orderNumber,\n" +
|
|
"b.csocode as orderNumber,\n" +
|
|
|
|
+ "b.cBatch as dyelotNumber ,"+
|
|
account + " as account,\n" +
|
|
account + " as account,\n" +
|
|
"0 as delflag,\n" +
|
|
"0 as delflag,\n" +
|
|
"f.AutoID as isosid,\n" +
|
|
"f.AutoID as isosid,\n" +
|
|
@@ -1684,11 +1686,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
list = senYuDataSourceTwo.queryForList(sql2);//902
|
|
list = senYuDataSourceTwo.queryForList(sql2);//902
|
|
}
|
|
}
|
|
List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
|
|
List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
|
|
|
|
+ List<SyPackingListFabricItem> items=new ArrayList<>();
|
|
System.out.println("jianSon的长度\t" + jianSon.size());
|
|
System.out.println("jianSon的长度\t" + jianSon.size());
|
|
for (JSONObject json1 : jianSon) {
|
|
for (JSONObject json1 : jianSon) {
|
|
SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
|
|
SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
|
|
sy1.setU8Id(account + sy1.getU8Id());//获取账套号+id
|
|
sy1.setU8Id(account + sy1.getU8Id());//获取账套号+id
|
|
- sy1.setSyPackingListFabricId(account + sy1.getSyPackingListFabricId());//账套号+主表id
|
|
|
|
|
|
+ sy1.setSyPackingListFabricId(sy.getId());//账套号+主表id
|
|
sy1.setId(sy1.getU8Id());
|
|
sy1.setId(sy1.getU8Id());
|
|
sy1.setIsosid(sy1.getAccount() + sy1.getIsosid());//账套号+销售订单id
|
|
sy1.setIsosid(sy1.getAccount() + sy1.getIsosid());//账套号+销售订单id
|
|
sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
|
|
sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
|
|
@@ -1697,6 +1700,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
sy1.setGroupId(oConvertUtils.getId());
|
|
sy1.setGroupId(oConvertUtils.getId());
|
|
|
|
|
|
QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
|
|
QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
+ System.out.println("isosid\t"+sy1.getIsosid());
|
|
queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
|
|
queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
|
|
queryWrapper2.last("limit 1");
|
|
queryWrapper2.last("limit 1");
|
|
SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
|
|
SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
|
|
@@ -1709,8 +1713,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//sy1.setPrice(syShippingDetailsItem.getSalesUnitPrice());//销售单价
|
|
//sy1.setPrice(syShippingDetailsItem.getSalesUnitPrice());//销售单价
|
|
- sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商编码
|
|
|
|
- sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商
|
|
|
|
|
|
+ //sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商编码
|
|
|
|
+ //sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商
|
|
sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
|
|
sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
|
|
sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
|
|
sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
|
|
sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
|
|
sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
|
|
@@ -1720,12 +1724,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
sy1.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比
|
|
sy1.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比
|
|
sy.setGarmentFactory(syShippingDetailsItem.getGarmentFactory());//获取成衣工厂
|
|
sy.setGarmentFactory(syShippingDetailsItem.getGarmentFactory());//获取成衣工厂
|
|
}
|
|
}
|
|
|
|
+ else{
|
|
|
|
+ throw new JeecgBootException("发运明细未有对应的数据");
|
|
|
|
+ }
|
|
if(sy1.getPrice()!=null&&sy1.getActualDeclaredQuantity()!=null){
|
|
if(sy1.getPrice()!=null&&sy1.getActualDeclaredQuantity()!=null){
|
|
sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
|
|
sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
|
|
}
|
|
}
|
|
- syPackingListFabricItemMapper.insert(sy1);//插入新数据
|
|
|
|
|
|
+ items.add(sy1);
|
|
|
|
+ //syPackingListFabricItemMapper.insert(sy1);//插入新数据
|
|
|
|
+ }
|
|
|
|
+ if(items.size()>0){
|
|
|
|
+ sy.setSyPackingListFabricItem(items);
|
|
|
|
+ syPackingListFabricMapper.insert(sy);//添加数据
|
|
|
|
+ for (SyPackingListFabricItem item : sy.getSyPackingListFabricItem()){
|
|
|
|
+ syPackingListFabricItemMapper.insert(item);//插入新数据
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- syPackingListFabricMapper.updateById(sy);//添加数据
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|