diff --git a/src/main/java/com/glxp/api/http/ErpInvClient.java b/src/main/java/com/glxp/api/http/ErpInvClient.java index fae99022d..4cb166f12 100644 --- a/src/main/java/com/glxp/api/http/ErpInvClient.java +++ b/src/main/java/com/glxp/api/http/ErpInvClient.java @@ -14,6 +14,7 @@ import com.glxp.api.res.inv.ThrInvResultResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; import com.glxp.api.service.thrsys.ThrSystemService; +import com.google.common.base.Throwables; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; import org.springframework.stereotype.Service; @@ -118,7 +119,7 @@ public class ErpInvClient { }); return listBaseResponse; } catch (Exception e) { - log.error("获取第三方库存明细异常", e); + log.error("获取第三方库存明细异常" + Throwables.getStackTraceAsString(e)); return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 4d35af59c..0cbea4c81 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -17,6 +17,7 @@ import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.dao.thrsys.ThrInvOrderDetailMapper; import com.glxp.api.dao.thrsys.ThrInvOrderMapper; +import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; @@ -34,6 +35,7 @@ import com.glxp.api.res.basic.MainIdRelIdAndProductResponse; import com.glxp.api.res.inv.ThrInvResultResponse; import com.glxp.api.res.thrsys.ThrInvOrderResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRlSupService; @@ -375,6 +377,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { return thrInvOrderMapper.delete(uw); } + @Resource + WarehouseUserService warehouseUserService; /** * 普耗收费出入库明细单据生成 @@ -434,9 +438,14 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setCustomerId("110"); ioOrderEntity.setCreateTime(new Date()); - Long userId = customerService.getUserId(); - ioOrderEntity.setCreateUser(userId + ""); - ioOrderEntity.setUpdateUser(userId + ""); + Long userId = null; + WarehouseUserEntity warehouseUserEntity = warehouseUserService.getOne(new QueryWrapper().eq("code", ioOrderEntity.getInvCode()).last("limit 1")); + if (warehouseUserEntity != null) { + userId = warehouseUserEntity.getUserid(); + ioOrderEntity.setCreateUser(warehouseUserEntity.getUserid() + ""); + ioOrderEntity.setUpdateUser(warehouseUserEntity.getUserid() + ""); + thrInvOrder.setUpdateUser(userId + ""); + } ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);//正常单据处理 List newOrderDetailBiz = new ArrayList<>(grouped.values().size()); @@ -457,7 +466,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ioOrderService.insertOrder(ioOrderEntity); thrInvOrder.setStatus(ConstantStatus.SFIO_CFMD);//已确认 thrInvOrder.setUpdateTime(new Date()); - thrInvOrder.setUpdateUser(userId + ""); + String toBillNo = (thrInvOrder.getToBillNo() == null ? "" : thrInvOrder.getToBillNo()) + ("," + newBillNo); // 检查字符串是否以逗号开始 @@ -1284,7 +1293,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { for (int i = 0; i < thrInvOrderDetails.size(); i++) { ThrInvOrderDetail thrInvOrderDetail = thrInvOrderDetails.get(i); Long relId = thrInvOrderDetail.getRelId(); - if (relId != null ) { + if (relId != null) { BasicProductsEntity basicProductsEntity = relIdBasicProductsEntityMap.get(relId); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); parameterPackag(basicProductsEntity, ioOrderDetailBizEntity, thrInvOrderDetail); diff --git a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java index b50a82ce5..44635bf01 100644 --- a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java +++ b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java @@ -199,7 +199,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer { try { thrInvOrderService.downloadInvSfOrder(thrSystemDetailEntity); } catch (Exception e) { - log.error("下载三方出入库明细收费异常", ExceptionUtils.getStackTrace(e)); + log.error("下载三方出入库明细收费异常" + ExceptionUtils.getStackTrace(e)); } finally { updateTask(getTaskKey(thrSystemDetailEntity)); }