diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
index f7ef88d89..54b65535a 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
@@ -34,6 +34,14 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 装车件数
+ */
+ @ApiModelProperty(value = "装车件数")
+ private Integer loadNub;
+
+
/**
* 包条数据
*/
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java
index c9366fdb5..6a77fbae5 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java
@@ -42,5 +42,10 @@ public class DistributionReservationStockarticleVO extends DistributionReservati
*/
@ApiModelProperty(value = "运单号")
private String waybillNumber;
+ /**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量")
+ private Integer signinQuantity;
}
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
index 6ac5d0de9..641f9b5c5 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
@@ -17,6 +17,7 @@
package com.logpm.distribution.vo;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +32,35 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class DistributionStockArticleVO extends DistributionStockArticleEntity {
private static final long serialVersionUID = 1L;
-
+ /**
+ * 物料名称
+ */
+ @ApiModelProperty(value = "物料名称")
+ private String materialName;
+ /**
+ * 已备货数量
+ */
+ @ApiModelProperty(value = "已备货数量")
+ private String readyStock;
+ /**
+ * 备货数量
+ */
+ @ApiModelProperty(value = "备货数量")
+ private String deliveryNumber;
+ /**
+ * 托盘
+ */
+ @ApiModelProperty(value = "托盘")
+ private String pallet;
+ /**
+ * 或为信息
+ */
+ @ApiModelProperty(value = "或为信息")
+ private String goodsAllocation;
+ /**
+ * 订单状态
+ */
+ @ApiModelProperty(value = "订单状态")
+ private String stockArticleState;
}
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 141c51446..7f3a543d3 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
@@ -114,6 +114,20 @@ public class DistributionDeliveryListController extends BladeController {
IPage<DistributionStockListVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryinventory(Condition.getPage(query), distributionDeliveryInfoDTO);
return R.data(pages);
}
+
+
+ /**
+ * 查看订单
+ */
+ @GetMapping("/order")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList")
+ public R<IPage<DistributionStockArticleVO>> order(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
+ IPage<DistributionStockArticleVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionDeliveryInfoDTO);
+ return R.data(pages);
+ }
+
+
/**
* 配送管理 分页
*/
@@ -170,20 +184,20 @@ public class DistributionDeliveryListController extends BladeController {
return msg;
}
- /**
- * 配送管理 装车扫描(单件装车)
- */
- @GetMapping("/singleloading")
- @ApiOperationSupport(order = 2)
- public R singleloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
- R msg = distributionDeliveryListService.singleloading(distrilbutionloadingscanDTO);
- return msg;
- }
+// /**
+// * 配送管理 装车扫描(单件装车)
+// */
+// @GetMapping("/singleloading")
+// @ApiOperationSupport(order = 2)
+// public R singleloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+// R msg = distributionDeliveryListService.singleloading(distrilbutionloadingscanDTO);
+// return msg;
+// }
/**
- * 配送管理 装车扫描(单件确认)
+ * 配送管理 装车扫描(一键装车)
*/
- @GetMapping("/oneloading")
+ @PostMapping("/oneloading")
@ApiOperationSupport(order = 2)
public R oneloading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.oneloading(distrilbutionloadingscanDTO);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java
index 72979cc47..2e7fdcdd8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java
@@ -52,7 +52,7 @@ import javax.servlet.http.HttpServletResponse;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("reservationStockarticle/distributionReservationStockarticle")
+@RequestMapping("/reservationStockarticle")
@Api(value = "预约订单中间表", tags = "预约订单中间表接口")
public class DistributionReservationStockarticleController extends BladeController {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
index ecf0b674e..06a172924 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
@@ -44,7 +44,7 @@ public class DistrilbutionloadingscanDTO {
* 车辆信息Id
*/
@ApiModelProperty(value = "车辆信息Id")
- @NotEmpty(message = "车辆信息Id不能为空")
+// @NotEmpty(message = "车辆信息Id不能为空")
private String loadingId;
// /**
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 3dcca67d7..325fc2383 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
@@ -23,6 +23,7 @@ import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.DistributionStockListVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -101,4 +102,10 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
* @return
*/
List<DistributionStockListVO> selectDistributionDeliveryinventoryPage(IPage<DistributionStockListVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
+ /**
+ * 通过配送查询订单
+ *
+ * @return
+ */
+ List<DistributionStockArticleVO> selectDistributionDeliveryOrderPage(IPage<DistributionStockArticleVO> 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 1b6e1eca5..ab5e2745f 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
@@ -57,7 +57,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
<where>
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lds.id = #{id}
+ lds.is_deleted =0 and lds.id = #{id}
</where>
</select>
<select id="selectcustomList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
@@ -108,7 +108,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
<where>
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lds.reservation_id = #{param.reservationId}
+ lds.is_deleted =0 and lds.reservation_id = #{param.reservationId}
</where>
</select>
<select id="selectWrapCount" resultType="java.lang.Integer">
@@ -158,12 +158,60 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
<where>
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lddl.id = #{param.deliveryId}
+ lds.is_deleted =0 and lddl.id = #{param.deliveryId}
</where>
</select>
<select id="selectDistributionDeliveryinventoryPage" resultType="com.logpm.distribution.vo.DistributionStockListVO">
</select>
+ <select id="selectDistributionDeliveryOrderPage" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">
+ SELECT
+ distinct ldsa.order_self_numbering orderSelfNumbering,
+ ldsa.description_goods descriptionGoods,
+ (
+ SELECT
+ GROUP_CONCAT( ldpl.material_name SEPARATOR ',' )
+ FROM
+ logpm_distribution_parcel_list ldpl
+ JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+ WHERE
+ ldrp.reservation_id = lds.reservation_id
+ ) materialName,
+ lddl.delivery_number deliveryNumber,
+ (
+ SELECT
+ count(*)
+ FROM
+ logpm_distribution_reservation_package ldrp
+ WHERE
+ ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_state = 3
+ ) readyStock,
+ (
+ SELECT
+ GROUP_CONCAT( ldpl.pallet SEPARATOR ',' )
+ FROM
+ logpm_distribution_parcel_list ldpl
+ JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+ WHERE
+ ldrp.reservation_id = lds.reservation_id
+ ) pallet,
+ (
+ SELECT
+ GROUP_CONCAT( ldpl.goods_allocation SEPARATOR ',' )
+ FROM
+ logpm_distribution_parcel_list ldpl
+ JOIN logpm_distribution_reservation_package ldrp ON ldrp.parce_list_id = ldpl.id
+ WHERE
+ ldrp.reservation_id = lds.reservation_id
+ ) goodsAllocation,
+ ldrs.stock_article_state stockArticleState
+ FROM
+ logpm_distribution_signfor lds
+ JOIN logpm_distribution_reservation_stockarticle ldrs ON lds.reservation_id = ldrs.reservation_id
+ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+ JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id
+ where lddl.id = #{param.deliveryId}
+ </select>
</mapper>
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 a07253358..ccef0fda3 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
@@ -27,6 +27,7 @@ import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.DistributionLoadscaninvnVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -153,4 +154,10 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @return
*/
List<DistributionLoadscaninvnEntity> selectdeliveryworkVnId(@Param("inventoryId") Integer inventoryId,@Param("deliveryId") Long deliveryId);
+ /**
+ * 通过预约查询库存
+ *
+ * @return
+ */
+ List<DistributionLoadscaninvnVO> selectdeliverOnevn(Long reservationId, 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 9a576226f..a060169e1 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
@@ -165,11 +165,9 @@
</where>
</select>
<select id="selectcommercialTotal" resultType="java.lang.Integer">
- SELECT COALESCE
- ( COUNT(*), 0 )
+ SELECT COALESCE (lddl.delivery_number,0)
FROM
logpm_distribution_delivery_list lddl
- JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
<where>
lddl.type = '1'
<if test="param.trainNumber != null and param.trainNumber!=''">
@@ -243,10 +241,9 @@
</select>
<select id="selectmarketTotal" resultType="java.lang.Integer">
SELECT COALESCE
- (COUNT(*), 0 )
+ (lddl.delivery_number, 0 )
FROM
logpm_distribution_delivery_list lddl
- JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
<where>
lddl.type = '2'
<if test="param.trainNumber != null and param.trainNumber!=''">
@@ -297,7 +294,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
where
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lddl.id = #{deliveryId} and ldpl.packet_bar_code =#{barcode}
+ lds.is_deleted =0 and lddl.id = #{deliveryId} and ldpl.packet_bar_code =#{barcode}
</select>
<select id="selectdeliverypallet" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
@@ -316,7 +313,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
where
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lddl.id = #{deliveryId} and ldpl.pallet =#{barcode}
+ lds.is_deleted =0 and lddl.id = #{deliveryId} and ldpl.pallet =#{barcode}
</select>
@@ -360,7 +357,7 @@
join logpm_distribution_reservation_stockarticle ldrs on lds.reservation_id = ldrs.reservation_id
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
- WHERE ldrs.is_have_data = '1' and ldsa.is_deleted =0 and lddl.id = #{deliveryId} and ldsa.id =#{barcode}
+ WHERE ldsa.is_deleted =0 and lddl.id = #{deliveryId} and ldsa.id =#{barcode}
</select>
<select id="selectOrderStrip" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
SELECT
@@ -378,7 +375,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
where
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lddl.id = #{deliveryId} and ldrs.stock_article_id =#{barcode}
+ lds.is_deleted =0 and lddl.id = #{deliveryId} and ldrs.stock_article_id =#{barcode}
</select>
<select id="selectdeliverOne" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
SELECT
@@ -396,7 +393,7 @@
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
where
- ldrs.is_have_data = '2' and lds.is_deleted =0 and lddl.id = #{deliveryId} and lds.reservation_id =#{reservationId}
+ lds.is_deleted =0 and lddl.id = #{deliveryId} and lds.reservation_id =#{reservationId}
</select>
<select id="selectdeliverOneNo" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
SELECT
@@ -412,7 +409,7 @@
join logpm_distribution_reservation_stockarticle ldrs on lds.reservation_id = ldrs.reservation_id
JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
join logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
- WHERE ldrs.is_have_data = '1' and ldsa.is_deleted =0 and lddl.id = #{deliveryId} and lds.reservation_id =#{reservationId}
+ WHERE ldsa.is_deleted =0 and lddl.id = #{deliveryId} and lds.reservation_id =#{reservationId}
</select>
<select id="selectRservationByDeliveryId" resultType="com.logpm.distribution.entity.DistributionReservationEntity">
SELECT
@@ -454,4 +451,19 @@
WHERE
lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldsl.id =#{inventoryId}
</select>
+ <select id="selectdeliverOnevn" resultType="com.logpm.distribution.vo.DistributionLoadscaninvnVO">
+ SELECT
+ ldsl.id inventoryId,
+ ldsl.packet_bar_code packetBarCode,
+ lds.reservation_id reservationId,
+ 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
+ WHERE
+ lds.is_deleted = 0 and lddl.id = #{deliveryId} and ldsl.id =#{inventoryId}
+ </select>
</mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
index 1027f3ab7..538e9539d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java
@@ -64,5 +64,5 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper<Di
* @param distributionReservationStockarticle
* @return
*/
- List<DistributionReservationStockarticleVO> selectDistributionReservationStockarticleorderPage(IPage<DistributionReservationStockarticleVO> page, DistributionReservationStockarticleVO distributionReservationStockarticle);
+ List<DistributionReservationStockarticleVO> selectDistributionReservationStockarticleorderPage(IPage<DistributionReservationStockarticleVO> page,@Param("param") DistributionReservationStockarticleVO distributionReservationStockarticle);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
index e7e7a3870..3b65ec579 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml
@@ -37,7 +37,29 @@
SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}
</select>
<select id="selectDistributionReservationStockarticleorderPage" resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">
-
+ SELECT
+ ldrs.id id,
+ ldsa.id stockArticleId,
+ ldsa.order_self_numbering orderSelfNumbering,
+ ldsa.waybill_number waybillNumber,
+ (CASE
+ WHEN ldrs.is_have_data = 2 THEN
+ (SELECT COALESCE(SUM(ldl.received_quantity), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id)
+ WHEN ldrs.is_have_data = 1 THEN
+ ldrs.reservation_num
+ END ) signinQuantity
+ FROM
+ logpm_distribution_reservation_stockarticle ldrs
+ JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id
+ <where>
+ <if test="param.orderSelfNumbering != null and param.orderSelfNumbering!=''">
+ and ldsa.order_self_numbering like concat('%', #{param.orderSelfNumbering},'%')
+ </if>
+ <if test="param.waybillNumber != null and param.waybillNumber!=''">
+ and ldsa.waybill_number like concat('%',#{param.waybillNumber},'%')
+ </if>
+ and ldrs.reservation_id = #{param.reservationId}
+ </where>
</select>
</mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 0618b3fd4..39638ae29 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -109,4 +109,10 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
* @return
*/
DistributionSignforVO selectOneCustom(@Param("id")Long id);
+ /**
+ * 查询车次装车件数
+ *
+ * @return
+ */
+ Integer selectloadNub(@Param("id")Long id);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 47d9c7ef7..d98f696db 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -347,9 +347,14 @@
select id,reservation_id,order_id from logpm_distribution_signfor where is_deleted = 0
</select>
<select id="selectdriverNubCount" resultType="java.lang.Integer">
- select COALESCE(COUNT(*), 0) from logpm_distribution_signfor
+ SELECT
+ COALESCE(COUNT(*), 0)
+ FROM
+ logpm_distribution_signfor lds
+ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+ JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
<where>
- is_deleted = 0 and driver_signing ='1'
+ lds.is_deleted = 0 and lds.driver_signing ='1'
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
@@ -384,18 +389,18 @@
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
- <if test="param.driverSigning != null and param.driverSigning!=''">
- and lds.driver_signing = #{param.driverSigning}
- </if>
- <if test="param.signingStatus != null and param.signingStatus!=''">
- and lds.signing_status = #{param.signingStatus}
- </if>
+
</where>
</select>
<select id="selectclerkNubCount" resultType="java.lang.Integer">
- select COALESCE(COUNT(*), 0) from logpm_distribution_signfor
+ SELECT
+ COALESCE(COUNT(*), 0)
+ FROM
+ logpm_distribution_signfor lds
+ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+ JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
<where>
- is_deleted = 0 and signing_status ='1'
+ lds.is_deleted = 0 and lds.signing_status ='1'
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
@@ -430,12 +435,8 @@
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
- <if test="param.driverSigning != null and param.driverSigning!=''">
- and lds.driver_signing = #{param.driverSigning}
- </if>
- <if test="param.signingStatus != null and param.signingStatus!=''">
- and lds.signing_status = #{param.signingStatus}
- </if>
+
+
</where>
</select>
<select id="selectIdByOrderId" resultType="java.lang.Long">
@@ -460,6 +461,7 @@
ldr.consignee consignee,
ldr.delivery_address deliveryAddress,
ldr.delivery_phone deliveryPhone,
+ lds.reservation_id reservationId,
ldr.reservation_date reservationDate,
CASE
@@ -474,5 +476,8 @@
JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
where lds.is_deleted = 0 and lds.id = #{id}
</select>
+ <select id="selectloadNub" resultType="java.lang.Integer">
+ SELECT COALESCE(sum(lds.loaded_number), 0) FROM logpm_distribution_signfor lds WHERE lds.delivery_id = #{id}
+ </select>
</mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
index ef0ef86fc..826c2b411 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java
@@ -22,6 +22,7 @@ import com.logpm.distribution.entity.DistributionDeliveryInfoEntity;
import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.DistributionStockListVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
@@ -74,4 +75,12 @@ public interface IDistributionDeliveryInfoService extends BaseService<Distributi
* @return
*/
IPage<DistributionStockListVO> selectDistributionDeliveryinventory(IPage<DistributionStockListVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
+ /**
+ * 从配送查看订单
+ *
+ * @param page
+ * @param distributionDeliveryInfoDTO
+ * @return
+ */
+ IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index b0f7a4f42..84dbc2b47 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -22,6 +22,7 @@ import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
import com.logpm.distribution.mapper.DistributionDeliveryInfoMapper;
import com.logpm.distribution.service.IDistributionDeliveryInfoService;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
import com.logpm.distribution.vo.DistributionStockListVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -72,4 +73,10 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
return page.setRecords(distributionDeliveryInfoVOS);
}
+ @Override
+ public IPage<DistributionStockArticleVO> selectDistributionDeliveryorder(IPage<DistributionStockArticleVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
+ List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionDeliveryInfoDTO);
+ return page.setRecords(distributionDeliveryInfoVOS);
+ }
+
}
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 c3935e3bb..c1894b3d9 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
@@ -78,6 +78,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionSigndetailServiceImpl distributionSigndetailService;
private final DistributionPackadeliServiceImpl distributionPackadeliService;
private final DistributionDeliverySelfMapper distributionDeliverySelfMapper;
+ private final DistributionDeliveryTripartiteMapper distributionDeliveryTripartiteMapper;
private final DistributionReservationStockarticleMapper distributionReservationStockarticleMapper;
private final BladeRedis bladeRedis;
@@ -110,15 +111,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//查询包条数据
//List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
//distributionDeliveryListVO.setPackadeList(stripList);
- if (detail.getSource() == 1) {
+ //装车件数
+ Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());
+ distributionDeliveryListVO.setLoadNub(sum);
+ // if (detail.getSource() == 1) {
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
distributionDeliveryListVO.setReservationList(customList);
- } else if (detail.getSource() == 2) {
- //查询订单信息
- List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());
- distributionDeliveryListVO.setReservationList(customList);
- }
+// } else if (detail.getSource() == 2) {
+// //查询订单信息
+// List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());
+// distributionDeliveryListVO.setReservationList(customList);
+// }
return distributionDeliveryListVO;
}
@@ -132,13 +136,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO();
//商配车次
- Integer commercialNub = baseMapper.selectBycommercialNub(distributionDeliveryList);
+ Integer a = baseMapper.selectBycommercialNub(distributionDeliveryList);
+ Integer commercialNub = a != null ? a: 0;
//商配件数
- Integer commercialTotal = baseMapper.selectcommercialTotal(distributionDeliveryList);
+ Integer b = baseMapper.selectcommercialTotal(distributionDeliveryList);
+ Integer commercialTotal = b != null ? b: 0;
//市配车次
- Integer marketNub = baseMapper.selectmarketNub(distributionDeliveryList);
+ Integer c = baseMapper.selectmarketNub(distributionDeliveryList);
+ Integer marketNub = c != null ? c: 0;
//市配件数
- Integer marketTotal = baseMapper.selectmarketTotal(distributionDeliveryList);
+ Integer d = baseMapper.selectmarketTotal(distributionDeliveryList);
+ Integer marketTotal = d != null ? d: 0;
//配送总车次
distributionstatisticsnmbVO.setVehiclesNub(commercialNub + marketNub);
//配送总件数
@@ -241,7 +249,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//获取当前用户司机
- DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+ DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
+ if (distributionDeliveryListEntity.getKind().equals("1")){
+ distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ }else {
+ DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity);
+ }
+
if (distrilbutionloadingscanDTO.getType() == 1) {
if (distrilbutionloadingscanDTO.getStockType() == 1) {
//查询该包条是否属于该配送任务
@@ -268,7 +284,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
+ if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ }
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
distributionLoadscanEntity.setScanStatus(2);
@@ -277,7 +295,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ }
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
//distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.);
//依次更新该装车记录,设置车辆
@@ -358,7 +378,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
+ if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ }
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
@@ -368,7 +390,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ }
//distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.);
//依次更新该装车记录,设置车辆
// distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
@@ -410,7 +434,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3004, "有其他车次货物");
}
//依次插入该装车记录,设置车辆
+ if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ }
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("2");
@@ -421,7 +447,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ }
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
@@ -440,7 +468,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫码");
}
//依次插入该装车记录,设置车辆
+ if (null != distributionDeliverySelfEntity.getDriverId()){
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ }
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
@@ -450,7 +480,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ }
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
@@ -476,7 +508,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫描");
}
//依次插入该装车记录,设置车辆
- distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ if (null != distributionDeliverySelfEntity.getDriverId()){
+ distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("3");
@@ -487,7 +520,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
- distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
+ distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
@@ -508,6 +542,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3002, "重复扫描");
}
//依次插入该装车记录,设置车辆
+ if (null != distributionDeliverySelfEntity.getDriverId()){
+ distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
distributionLoadscanEntity.setDriverId(distrilbutionloadingscanDTO.getLoadingId());
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
@@ -518,7 +554,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
+ if (null !=distributionDeliverySelfEntity.getVehicleId()){
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ }
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
@@ -573,11 +611,21 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
#5.3 更新预约单关联库存品的数量
*/
//获取当前用户司机
- DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
+ if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())){
+ distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
+ .eq(DistributionDeliverySelfEntity::getIsMaster,2)
+ .eq(DistributionDeliverySelfEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
+ );
+ }else {
+ distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ }
//先查询有数据的
List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverOne(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//无数据的
- List<DistributionLoadscanEntity> distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
+ // List<DistributionLoadscanEntity> distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
+ //查询库存品
+ List<DistributionLoadscaninvnVO> distributionLoadscanvnEntities = baseMapper.selectdeliverOnevn(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId());
//将该客户所有的物品上该车辆
if (distributionLoadscanEntities.size() > 0) {
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@@ -591,16 +639,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
continue;
}
//依次插入该装车记录,设置车辆
- distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverId())){
+ distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setOneClick(2);
distributionLoadscanEntity.setScanTime(new Date());
- if (null != distributionDeliverySelfEntity.getDriverPhone()) {
+ if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
- distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getVehicleId())){
+ distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -609,45 +659,49 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
distributionLoadscanService.saveBatch(distributionLoadscanEntities);
}
- if (distributionLoadscanEntitiesno.size() > 0) {
- for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntitiesno) {
- //查询是否重复扫码
- List<DistributionLoadscanEntity> distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
- .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId())
- .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode())
- .ne(DistributionLoadscanEntity::getScanStatus, 1)
- );
- if (distributionLoadscanEntitiesflag.size() > 0) {
- continue;
- }
- //依次插入该装车记录,设置车辆
- distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
- distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
- distributionLoadscanEntity.setScanStatus(2);
- distributionLoadscanEntity.setScanType("3");
- distributionLoadscanEntity.setScanTime(new Date());
- distributionLoadscanEntity.setScanState(1);
- distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
- distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
- if (null != distributionDeliverySelfEntity.getDriverPhone()) {
- distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
- }
- distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
- //查询本车次是否第一次扫码,没有则更新上车时间
- Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
- //更新签收表的装车数量
- Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
- }
- distributionLoadscanService.saveBatch(distributionLoadscanEntities);
+ //库存品装车
- }
+// if (distributionLoadscanEntitiesno.size() > 0) {
+// for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntitiesno) {
+// //查询是否重复扫码
+// List<DistributionLoadscanEntity> distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
+// .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId())
+// .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode())
+// .ne(DistributionLoadscanEntity::getScanStatus, 1)
+// );
+// if (distributionLoadscanEntitiesflag.size() > 0) {
+// continue;
+// }
+// //依次插入该装车记录,设置车辆
+// if (null != distributionDeliverySelfEntity.getDriverId()){
+// distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+// }
+// distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
+// distributionLoadscanEntity.setScanStatus(2);
+// distributionLoadscanEntity.setScanType("3");
+// distributionLoadscanEntity.setScanTime(new Date());
+// distributionLoadscanEntity.setScanState(1);
+// distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
+// distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub());
+// if (null != distributionDeliverySelfEntity.getDriverPhone()) {
+// distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
+// }
+// if (null !=distributionDeliverySelfEntity.getVehicleId()){
+// distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
+// //查询本车次是否第一次扫码,没有则更新上车时间
+// Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
+// //更新签收表的装车数量
+// Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
+// }
+// distributionLoadscanService.saveBatch(distributionLoadscanEntities);
+// }
return R.success("成功");
}
@Override
public R oneack(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//获取当前用户司机
- DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ //DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
//将当前车次的所有信息装车
boolean update = distributionLoadscanService.update(new UpdateWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())
@@ -753,7 +807,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//库存品
//查询预约
//获取当前用户司机
- DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+ DistributionDeliverySelfEntity distributionDeliverySelfEntity = null;
+ if (distributionDeliveryListEntity.getKind().equals("1")){
+ distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ }else {
+ DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+ BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity);
+ }
List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnId(distrilbutionloadingscanDTO.getInventoryId(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanvnEntities.size() <= 0) {
return R.fail(3001, "窜货");
@@ -769,7 +830,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// return R.fail(3002, "重复货物");
// }
//依次插入该装车记录,设置车辆
- distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());
+ if (null !=distributionDeliverySelfEntity.getDriverId()){
+ distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());}
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName());
distributionLoadscanEntity.setScanStatus(2);
distributionLoadscanEntity.setScanType("1");
@@ -780,7 +842,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (null != distributionDeliverySelfEntity.getDriverPhone()) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
- distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
+ if (null != distributionDeliverySelfEntity.getVehicleId()){
+ distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());}
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量