Merge branch 'dev' into pre-production

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java

@@ -31,5 +31,6 @@ public class DistributionStockupStockListVO implements Serializable {
 	private Boolean  trayLean;//整托状态
 
 	private Integer unpack;//是否拆包 0 没有 1 拆了
+	private String sourceType;//是否拆包 1 订单 2导入
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -752,6 +752,9 @@ public class DistributionStockupAppController extends BladeController {
 					if(ObjectUtils.isNotNull(list) && list.size() > 1){
 						throw new ServiceException("查询到重复包条信息！！");
 					}
+					if(ObjectUtils.isNull(list)){
+						throw new ServiceException("没有查询到包件信息");
+					}
 					WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
 					warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
 					warehouseUpdownGoodsEntity.setAssociationId(list.get(0).getId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -240,6 +240,7 @@
         ldst.cargo_unit cargoUnit,
         ldst.tray_name trayName,
         ldst.unpack unpack,
+        ldst.source_type sourceType,
         count(ldss.id) realNum,
         CASE
         WHEN ldst.source_type = '2' THEN
@@ -265,7 +266,7 @@
         where ldrs.reservation_id = #{reservationId}
         and ldrs.is_deleted = 0
         group by ldst.id, ldst.storage_location, ldst.description_goods,  ldst.sku,ldrs.id,
-        ldst.cargo_norms,  ldrs.reservation_num,  ldst.cargo_unit,  ldst.tray_name,  ldst.unpack
+        ldst.cargo_norms,  ldrs.reservation_num,  ldst.cargo_unit,  ldst.tray_name,  ldst.source_type
     </select>
 
     <select id="selectOrderNumByReservationId" resultType="Integer">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -571,6 +571,8 @@
                ldsl.cargo_unit                           cargoUnit,
                ldsl.tray_name                            trayName,
                 ldsl.unpack                               unpack,
+               ldsl.source_type                               sourceType,
+
                (
                    select COUNT(id)
                    from logpm_distribution_stock
@@ -585,7 +587,7 @@
                               ldsl.warehouse_id = lwug.warehouse_id
         where lddd.bill_lading_id = #{reservationId}
         GROUP BY lddd.stock_list_id, ldsl.description_goods, ldsl.sku, ldsl.cargo_norms, lddd.quantity, ldsl.cargo_unit,
-                 ldsl.tray_name, ldsl.unpack, lddd.id
+                 ldsl.tray_name, ldsl.source_type,ldsl.unpack,lddd.id
 
     </select>
     <select id="selectStockupDetailsZero" resultType="com.logpm.distribution.vo.DistributionStockupSelfVO">