|
|
@@ -87,7 +87,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
|
|
|
BigDecimal total=new BigDecimal("0");//合计数量，初始为0
|
|
|
for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
|
|
|
- entity.setRemainingQuantity(entity.getInventoryQuantity());//入库数量
|
|
|
+ //entity.setRemainingQuantity(entity.getInventoryQuantity());//入库数量
|
|
|
total=total.add(entity.getInventoryQuantity());//循环添加每条数据的入库数量
|
|
|
String key=entity.getSyShippingDetailsItemId();//获取发运明细子表id
|
|
|
if(!mapId.containsKey(key)){//如果这个发运明细id没有分组id,就生成一个新的分组id
|
|
|
@@ -175,7 +175,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
row++;
|
|
|
}
|
|
|
return syPackingListFabricList;*/
|
|
|
-return null;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -219,7 +219,7 @@ return null;
|
|
|
* 每3分钟拉取一次数据
|
|
|
*/
|
|
|
@Override
|
|
|
- @Scheduled(fixedRate=1000*60*3)
|
|
|
+ @Scheduled(fixedRate=1000*60*300)
|
|
|
//@Transactional
|
|
|
public void getU8Data() {
|
|
|
SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
|
huxy