1.运单列表查询逻辑修改

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java

@@ -45,4 +45,7 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity {
 
 	private Long waybillId;
 
+	private String productNum;
+	private String productPrice;
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -732,6 +732,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				stockArticleEntity.setMallId(consigneeId1);
 				stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
 				stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+				stockArticleEntity.setTypeService(basicdataClientEntity.getTypeService()+"");
 				stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName());
 				stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile());
 				stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -322,7 +322,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 	public void updatePackageStatus(List<String> orderPackageCodes, Integer workNode, Long warehouseId, Map<String, JSONObject> map) {
 
 
-		if(!workNode.equals(WorkNodeEnums.OPEN_ORDER.getCode())){
+		if(workNode.equals(WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode()) || workNode.equals(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode())){
 			BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId);
 			if(!Objects.isNull(warehouseEntity)){
 				//更新所有包件的当前所在仓

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -146,8 +146,11 @@
 
 
     <select id="pageList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
-        select lww.*
+        select lww.*,
+             GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
+             GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice
         from logpm_warehouse_waybill lww
+        left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id
         where lww.is_deleted = 0
         <if test="param.waybillNoList != null">
             and lww.waybill_no not in
@@ -287,7 +290,13 @@
         <if test="param.freezeTimeEndDate != null">
             and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
         </if>
-
+        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+            and lww.destination_warehouse_id in
+            <foreach collection="param.destinationWarehouseIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by lww.id
         order by lww.create_time desc
     </select>
 
@@ -838,8 +847,11 @@
     </select>
 
     <select id="exportWaybillList" resultType="com.logpm.warehouse.vo.ExportWarehouseWaybillVO">
-        select lww.*
+        select lww.*,
+        GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
+        GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice
         from logpm_warehouse_waybill lww
+        left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id
         where lww.is_deleted = 0
         <if test="param.waybillNoList != null">
             and lww.waybill_no not in
@@ -979,7 +991,13 @@
         <if test="param.freezeTimeEndDate != null">
             and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
         </if>
-
+        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+            and lww.destination_warehouse_id in
+            <foreach collection="param.destinationWarehouseIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by lww.id
         order by lww.create_time desc
     </select>