Browse Source

1.修复因为修改了字段类型引发的问题

dev-warehouse
zhenghaoyu 1 year ago
parent
commit
8c70cced65
  1. 2
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java
  2. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
  3. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

2
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java

@ -55,6 +55,6 @@ public interface IWarehouseWaybillClient {
@PostMapping(API_PREFIX + "/addEnntity")
void addEnntity(@RequestBody WarehouseWaybillEntity warehouseWaybill);
@PostMapping(API_PREFIX + "/addEnntity")
@PostMapping(API_PREFIX + "/updateEntity")
void updateEntity(@RequestBody WarehouseWaybillEntity warehouseWaybill);
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

@ -168,7 +168,7 @@ public class WarehouseWaybillController extends BladeController {
log.warn("################splitOrder: 当前在库订单已转库存品,不能拆单 waybillNo={}",waybillNo);
return R.fail(405,"当前在库订单已转库存品");
}
Integer state = distributionStockArticleEntity.getState();//订单状态
Integer state = Integer.parseInt(distributionStockArticleEntity.getState());//订单状态
Long orderId = distributionStockArticleEntity.getId();//订单id
if(!state.equals(1)){
log.warn("################splitOrder: 当前在库订单已进入配送流程,不能拆单 waybillNo={}",waybillNo);

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@ -294,7 +294,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
distributionStockArticleEntity.setCustomerTelephone(warehouseWaybill.getConsigneeMobile());
distributionStockArticleEntity.setCustomerAddress(warehouseWaybill.getConsigneeAddress());
distributionStockArticleEntity.setGenre(1);
distributionStockArticleEntity.setState(1);
distributionStockArticleEntity.setState(1+"");
distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位(经销商)
distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人
distributionStockArticleEntity.setReserve1("zero");

Loading…
Cancel
Save