From 57fa1be7c135f33a6a41a6b4b1808c285f4d577f Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 20 Jul 2023 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/DistributionStockListEntity.java | 5 ++
.../vo/DistributionStockListVO.java | 16 +++++
.../DistributionDeliveryAppController.java | 72 +++++++++++++++++++
.../DistributionSignforAppController.java | 62 ++++++++++++++++
.../DistributionDeliveryListController.java | 41 +----------
.../DistributionSignforController.java | 29 --------
.../DistributionDeliveryInfoMapper.java | 2 +-
.../mapper/DistributionDeliveryInfoMapper.xml | 13 ++--
.../DistributionDeliveryListMapper.java | 10 ++-
.../mapper/DistributionDeliveryListMapper.xml | 32 ++++++++-
.../mapper/DistributionStockupMapper.xml | 2 +-
.../DistributionDeliveryListServiceImpl.java | 17 +++--
.../impl/DistributionStockupServiceImpl.java | 1 +
13 files changed, 219 insertions(+), 83 deletions(-)
create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
index e3de1e05c..fb9da7254 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
@@ -48,6 +48,11 @@ public class DistributionStockListEntity extends TenantEntity {
*/
@ApiModelProperty(value = "预留1")
private String reserve1;
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
/**
* 预留2
*/
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java
index c4c60b4fa..8413987ca 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java
@@ -17,6 +17,7 @@
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionStockListEntity;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,5 +32,20 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class DistributionStockListVO extends DistributionStockListEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 备货数
+ */
+ @ApiModelProperty(value = "备货数")
+ private String deliveryNumber;
+ /**
+ * 物料名称
+ */
+ @ApiModelProperty(value = "物料名称")
+ private String descriptionGoods;
+ /**
+ * 货位名称
+ */
+ @ApiModelProperty(value = "货位名称")
+ private String goodsAllocation;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
new file mode 100644
index 000000000..a531a28b8
--- /dev/null
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
@@ -0,0 +1,72 @@
+package com.logpm.distribution.appcontroller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
+import com.logpm.distribution.service.IDistributionDeliveryInfoService;
+import com.logpm.distribution.service.IDistributionDeliveryListService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 预约列表 控制器
+ *
+ * @author lmy
+ * @since 2023-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/delivery")
+@Api(value = "配送管理", tags = "配送管理App接口")
+public class DistributionDeliveryAppController {
+ private final IDistributionDeliveryListService distributionDeliveryListService;
+
+ private final IDistributionDeliveryInfoService distributionDeliveryInfoService;
+
+
+ /**
+ * 配送管理 装车扫描
+ */
+ @PostMapping("/loadingscan")
+ @ApiOperationSupport(order = 2)
+ public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+ R msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
+ return msg;
+ }
+
+ /**
+ * 配送管理 库存品装车
+ */
+ @PostMapping("/loadinginventory")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "DistrilbutionloadingscanDTO")
+ public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+ R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO);
+ return msg;
+ }
+
+ /**
+ * 配送管理 装车扫描（取消）
+ */
+ @PostMapping("/loadingscanoff")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
+ public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+ R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO);
+ return msg;
+ }
+
+ /**
+ * 配送管理 装车确认(确认)
+ */
+ @GetMapping("/oneack")
+ @ApiOperationSupport(order = 2)
+ public R oneack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+ R msg = distributionDeliveryListService.oneack(distrilbutionloadingscanDTO);
+ return msg;
+ }
+}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
new file mode 100644
index 000000000..f02ea2764
--- /dev/null
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
@@ -0,0 +1,62 @@
+package com.logpm.distribution.appcontroller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.distribution.dto.DistrilbutionAppsignforDTO;
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.service.IDistributionReservationService;
+import com.logpm.distribution.service.IDistributionSignforService;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 签收 控制器
+ *
+ * @author lmy
+ * @since 2023-07-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/signfor")
+@Api(value = "签收管理", tags = "签收管理App接口")
+public class DistributionSignforAppController {
+
+ private final IDistributionSignforService distributionSignforService;
+
+ private final IDistributionReservationService reservationService;
+ /**
+ * 司机扫描签收管理 客户签收
+ */
+ @GetMapping("/signfor")
+ @ApiOperationSupport(order = 2)
+ public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
+ R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO);
+ return msg;
+ }
+
+ /**
+ * 司机扫描签收管理 不在配送单签收
+ */
+ @GetMapping("/signforcontinue")
+ @ApiOperationSupport(order = 2)
+ public R signforcontinue(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
+ R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO);
+ return msg;
+ }
+ /**
+ * 司机签收管理 确认签收
+ */
+ @GetMapping("/signforack")
+ @ApiOperationSupport(order = 2)
+ public R signforack(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
+ R msg = distributionSignforService.signforack(distributionSignfor);
+ return msg;
+ }
+
+}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index d40cb1fa0..41c0f6065 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -152,37 +152,10 @@ public class DistributionDeliveryListController extends BladeController {
}
- /**
- * 配送管理 装车扫描
- */
- @PostMapping("/loadingscan")
- @ApiOperationSupport(order = 2)
- public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
- R msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
- return msg;
- }
- /**
- * 配送管理 库存品装车
- */
- @PostMapping("/loadinginventory")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "DistrilbutionloadingscanDTO")
- public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
- R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO);
- return msg;
- }
- /**
- * 配送管理 装车扫描（取消）
- */
- @PostMapping("/loadingscanoff")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
- public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
- R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO);
- return msg;
- }
+
+
// /**
// * 配送管理 装车扫描(单件装车)
@@ -214,15 +187,7 @@ public class DistributionDeliveryListController extends BladeController {
return msg;
}
- /**
- * 配送管理 装车确认(确认)
- */
- @GetMapping("/oneack")
- @ApiOperationSupport(order = 2)
- public R oneack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
- R msg = distributionDeliveryListService.oneack(distrilbutionloadingscanDTO);
- return msg;
- }
+
/**
* 配送管理 点击发车
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index 8cad46e6b..dad78058a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -122,35 +122,6 @@ public class DistributionSignforController extends BladeController {
return R.data(pages);
}
- /**
- * 司机扫描签收管理 签收
- */
- @GetMapping("/signfor")
- @ApiOperationSupport(order = 2)
- public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
- R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO);
- return msg;
- }
-
- /**
- * 司机扫描签收管理 不在单子签收
- */
- @GetMapping("/signforcontinue")
- @ApiOperationSupport(order = 2)
- public R signforcontinue(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
- R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO);
- return msg;
- }
- /**
- * 司机签收管理 确认签收
- */
- @GetMapping("/signforack")
- @ApiOperationSupport(order = 2)
- public R signforack(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
- R msg = distributionSignforService.signforack(distributionSignfor);
- return msg;
- }
-
/**
* 签收管理 新增
*/
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
index 325fc2383..daaf79fe3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
@@ -101,7 +101,7 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
*
* @return
*/
- List<DistributionStockListVO> selectDistributionDeliveryinventoryPage(IPage<DistributionStockListVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
+ List<DistributionStockListVO> selectDistributionDeliveryinventoryPage(IPage<DistributionStockListVO> page,@Param("param") DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
/**
* 通过配送查询订单
*
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 1624e53b2..420ea6bce 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -169,24 +169,27 @@
</where>
</select>
<select id="selectDistributionDeliveryinventoryPage" resultType="com.logpm.distribution.vo.DistributionStockListVO">
+ select
ldsl.sku sku,
ldsl.order_self_numbering orderSelfNumbering,
ldsl.description_goods descriptionGoods,
ldsl.unit unit,
( SELECT
- count(*)
+ sum(ldrsl.reservation_num)
FROM
logpm_distribution_reservation_stocklist ldrsl
WHERE
- ldrsl.reservation_id = lds.reservation_id) deliveryNumber,
+ ldrsl.stocklist_id = ldsl.id) deliveryNumber,
(
SELECT
count(*)
FROM
- logpm_distribution_reservation_stocklist ldrsl
+ logpm_distribution_stock lds
WHERE
- ldrsl.reservation_id = lds.reservation_id
- ) readyStock
+ ldsl.id = lds.stock_list_id
+ ) readyStock,
+ ldsl.storage_location goodsAllocation,
+ ldsl.cargo_number cargoNumber
FROM
logpm_distribution_reservation_stocklist ldrsl
JOIN logpm_distribution_signfor lds on lds.reservation_id = ldrsl.reservation_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
index e2fa21b42..fd7a9d8d0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
@@ -161,9 +161,15 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
*/
List<DistributionLoadscaninvnVO> selectdeliverOnevn(Long reservationId, Long deliveryId);
/**
- * 通过配送任务库存品扫描
+ * 通过配送任务库存品扫描（无拆包）
*
* @return
*/
- List<DistributionLoadscaninvnEntity> selectdeliveryworkVnScan(String barcode, Long deliveryId);
+ List<DistributionLoadscaninvnEntity> selectdeliveryworkVnScan(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId);
+ /**
+ * 通过配送任务库存品扫描（拆包）
+ *
+ * @return
+ */
+ List<DistributionLoadscaninvnEntity> selectdeliveryworkVnScanStock(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 6adc2b18b..77a6c4553 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -467,6 +467,36 @@
lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldsl.id =#{inventoryId}
</select>
<select id="selectdeliveryworkVnScan" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
-
+ SELECT
+ ldpl.id packageId,
+ ldpl.stock_article_id orderId,
+ ldpl.packet_bar_code packetBarCode,
+ lds.reservation_id reservationId,
+ ldpl.quantity packageNub,
+ lddl.id deliveryId,
+ lddl.train_number trainNumber
+ FROM
+ logpm_distribution_reservation_stocklist ldrs
+ JOIN logpm_distribution_signfor lds ON lds.reservation_id = ldrs.reservation_id
+ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+ JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
+ join logpm_distribution_parcel_list ldpl on ldsl.parcel_list_id =ldpl.id
+ WHERE
+ lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldpl.packet_bar_code =#{barcode}
+ </select>
+ <select id="selectdeliveryworkVnScanStock" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
+ SELECT
+ lds.id packageId,
+ lds.stock_article orderId,
+ lds.coding packetBarCode,
+ lds.reservation_id reservationId,
+ 1 packageNub,
+ lddl.id deliveryId,
+ lddl.train_number trainNumber
+ FROM
+ logpm_distribution_delivery_list lddl
+ join
+ logpm_distribution_stock lds on lds.delivery_list_id = lddl.id
+ where lddl.id = #{deliveryId} and ldpl.coding =#{barcode}
</select>
</mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index b7445c6e0..8d671800c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -62,7 +62,7 @@
SELECT * FROM logpm_distribution_stockup ${ew.customSqlSegment}
</select>
- <select id="selectStockupPage" resultMap="com.logpm.distribution.vo.DistributionStockupListVO">
+ <select id="selectStockupPage" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
select ldr.id reservationId,
ldr.delivery_type typeService,
lds.stockup_status stockupStatus,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 36a7253bf..f976ea8bc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -805,7 +805,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//库存品
- //查询预约
//获取当前用户司机
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
@@ -817,8 +816,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
boolean b =false;
if (distrilbutionloadingscanDTO.getInventorytype()==3){
- List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
+ //无拆包
+ List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = new ArrayList<>();
+ distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanvnEntities.size() <= 0) {
+ //拆包从备货查询
+ distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScanStock(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
return R.fail(3001, "窜货");
}
for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) {
@@ -838,6 +841,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
distributionLoadscanEntity.setScanTime(new Date());
+ if (null == distributionLoadscanEntity.getPackageNub() ){
+ distributionLoadscanEntity.setPackageNub(1);
+ }
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
distributionLoadscanEntity.setLoadedNub(distrilbutionloadingscanDTO.getInventoryNub());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
@@ -849,13 +855,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
- Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distrilbutionloadingscanDTO.getInventoryNub());
-
+ Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}
b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities);
- }
-
+ }else if (distrilbutionloadingscanDTO.getInventorytype()==1){
+ }
return R.status(b);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index b9b93994a..b99e088a5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -66,6 +66,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
@Autowired
private IDistributionStockService distributionStockService;
+
@Override
public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {
return page.setRecords(baseMapper.selectDistributionStockupPage(page, distributionStockup));