Merge branch 'uat-temp-nht-2503250001-twoshippingcheck' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -155,6 +155,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         if (!StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
             model.setIsScanLocationCode(true);
         }
+        model.setStatus(orderManagement.getStatus());
         model.setVolvoRackNo(orderManagement.getRackNo());
         //发运单号
         model.setShippingCode(orderManagement.getShippingCode());

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java

@@ -57,6 +57,9 @@ public class MesSortShippingCheckModel {
     @ApiParam("料架条码")
     private String volvoRackNo;
 
+    @ApiParam("发运单状态")
+    private Integer status;
+
     public void setDetailList(List<MesShippingOrderManagementDetail> detailList) {
         this.detailList = detailList;
         this.isScanCount = (int) detailList.stream().filter(k -> Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).count();