diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java
index 4decd1cdb..5302f0a09 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java
@@ -12,6 +12,7 @@ public class ZeroSuppleVO implements Serializable {
private String orderCode;
private Integer enterNum;//输入数量
private Long finalNodeId;//目的仓id
+ private Long signOrderId;//签收单id
}
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index f753683b3..137ddb195 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -52,7 +52,7 @@
and ltcl.load_status = #{param.loadStatus}
- and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
+ and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
and ltcl.create_time >= #{param.createTimeStart}
@@ -135,6 +135,9 @@
and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
+
+ and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
+
and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
@@ -561,13 +564,19 @@
IFNULL(lww.total_freight,0) totalFreight,
lww.total_count,
lww.remark remark,
- ROUND(lww.total_freight/lww.total_count,2) price
+ ROUND(lww.total_freight/lww.total_count,2) price,
+ ltlso.load_sign_code loadSignCode,
+ ltlso.id signOrderId
from logpm_distribution_stock_article ldsa
left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number
+ left join logpm_trunkline_load_sign_order ltlso on ltlso.mall_name = ldsa.mall_name and ltlso.load_id = #{param.loadId}
where ldsa.is_zero = 1
and lww.destination_warehouse_id != #{param.warehouseId}
and ldsa.hand_quantity > 0
and ldsa.warehouse_id = #{param.warehouseId}
+
+ and ltlso.id is not null
+
and ldsa.order_code not in
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 78d126c6b..ae0461c3f 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -2880,7 +2880,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl 0 ){
+// signOrderEntity.setSignStatus("10");
+// }
+// trunklineLoadSignOrderService.updateById(signOrderEntity);
+ }
}
//更新数量
updateNumByLoadId(loadId);
@@ -5228,10 +5242,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl num){
+ log.warn("##############signScanPackageCode: 签收数量不能大于当前数据的装车数量 num={} enterNum={}", num, enterNum);
+ return R.fail(405, "签收数量不能大于当前数据的装车数量");
+ }
+
carsLoadScanEntity.setScanStatus("3");
carsLoadScanEntity.setUnloadNum(enterNum);
carsLoadScanEntity.setUnloadAbnormal(0);
@@ -6002,11 +6022,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("sign_order_id",signOrderId)
+ .eq("type",2)
+ .eq("scan_status","3");
-
+ List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+ carsLoadScanEntityList.forEach(carsLoadScanEntity -> {
+ Integer num = carsLoadScanEntity.getNum();
+ Integer unloadNum = carsLoadScanEntity.getUnloadNum();
+ String orderCode = carsLoadScanEntity.getOrderCode();
+ Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
+ if(unloadNum != num){
+ int diff = num - unloadNum;
+ DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+ distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff);
+ }
+ });
+ trunklineLoadSignOrderService.updateById(signOrderEntity);
}
-
-
return R.success("添加成功");
}