|
|
|
@ -226,11 +226,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
|
|
|
|
|
public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException { |
|
|
|
|
|
|
|
|
|
//先保存原始请求数据
|
|
|
|
|
OrderStatusLog panOrderStatusLog = new OrderStatusLog(); |
|
|
|
|
panOrderStatusLog.setArgs(JSONObject.toJSONString(orderStatusDTO)); |
|
|
|
|
panOrderStatusLog.setStatus(1); |
|
|
|
|
panOrderStatusLog.setType(2); |
|
|
|
|
panOrderStatusLogService.save(panOrderStatusLog); |
|
|
|
|
// OrderStatusLog panOrderStatusLog = new OrderStatusLog();
|
|
|
|
|
// panOrderStatusLog.setArgs(JSONObject.toJSONString(orderStatusDTO));
|
|
|
|
|
// panOrderStatusLog.setStatus(1);
|
|
|
|
|
// panOrderStatusLog.setType(2);
|
|
|
|
|
// panOrderStatusLogService.save(panOrderStatusLog);
|
|
|
|
|
|
|
|
|
|
String status = orderStatusDTO.getStatus(); |
|
|
|
|
if ("1".equals(status) || "2".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { |
|
|
|
@ -455,11 +455,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
|
|
|
|
|
distributionStockArticleEntity.setCompleteSet(0); |
|
|
|
|
} |
|
|
|
|
logger.info("############basicdataWarehouseEntity {}", basicdataWarehouseEntity); |
|
|
|
|
if (!Objects.isNull(basicdataWarehouseEntity)) { |
|
|
|
|
distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); |
|
|
|
|
} |
|
|
|
|
distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); |
|
|
|
|
|
|
|
|
|
WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum); |
|
|
|
|
WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(Objects.isNull(wayBillEntity)){ |
|
|
|
|