1.直发商家签收bug修复

2.包件码模版渲染逻辑修改

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

@@ -20,4 +20,6 @@ public class OrderPackgeCodeDataVO  {
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map> dataList;
 
+	private List<String> moldList;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -46,8 +46,6 @@ import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleNewWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
-import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
@@ -792,6 +790,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		orderPackgeCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("包件码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderPackgeCodeDataVO.setMoldList(moldList);
+
 		return orderPackgeCodeDataVO;
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -360,6 +360,7 @@
         select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where sign_order_id = #{signOrderId}
+        and scan_status = '3'
     </select>
 
     <update id="updateFinalNodeIdAndFinalNodeNameById">