bug修改

fencang
anthonyywj2 3 years ago
parent f54330393a
commit 391671a521

@ -195,15 +195,12 @@ public class SpsSyncUploadController {
//耗材字典导入 //耗材字典导入
if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
try {
List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities(); List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
mapper.insertUdiInfo(udiInfoEntity); mapper.insertUdiInfo(udiInfoEntity);
} }
batchSession.commit(); batchSession.commit();
} catch (Exception e) {
}
} }
} }

@ -910,15 +910,20 @@ public class IoTransInoutService {
} }
} else if (orderEntity.getContrastStatus() == ConstantStatus.ORDER_CHECK_SUCCESS) { } else if (orderEntity.getContrastStatus() == ConstantStatus.ORDER_CHECK_SUCCESS) {
String[] erpIds = orderEntity.getErpFk().split(","); String[] erpIds = orderEntity.getErpFk().split(",");
if (erpIds != null && erpIds.length > 0) { if (erpIds == null || erpIds.length == 0) {
if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
erpIds = new String[1];
erpIds[0] = orderEntity.getErpFk();
}
}
for (int i = 0; i < erpIds.length; i++) { for (int i = 0; i < erpIds.length; i++) {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillNo(erpIds[i]); stockOrderFilterRequest.setBillNo(erpIds[i]);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(new CheckOrderUtils().getStockOrderStatus(orderEntity, bussinessTypeEntity)); stockOrderEntity.setStatus(new CheckOrderUtils().getStockOrderStatus(orderEntity, bussinessTypeEntity));
stockOrderEntity.setOrderIdFk(orderEntity.getId());
stockOrderService.updateById(stockOrderEntity); stockOrderService.updateById(stockOrderEntity);
} }
}
} }
} }

Loading…
Cancel
Save