加字段

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -83,6 +83,22 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 车牌号
      */
     private String carNumber;
+    /**
+     * 箱号
+     */
+    private String boxNo;
+    /**
+     * 箱号2
+     */
+    private String boxNoOther;
+    /**
+     * 封号
+     */
+    private String titleNo;
+    /**
+     * 封号2
+     */
+    private String titleNoOther;
     /**
      * 联系人
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -707,7 +707,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             contractProcessInfoService.deleteById(contractProcessInfo.getId());
             if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
                 //临时仓库信息
-                WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>().eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo()));
+                WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                        .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
+                        .eq("comp_id",contractManagementInfo.getCompId()));
                 warehouseBaseInfoService.deleteById(warehouseBaseInfo.getId());
                 //临时仓库出入库信息
                 List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>().eq(WarehouseInOutInfo.QueryFiles.BASE_ID, warehouseBaseInfo.getId()));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -36,6 +36,10 @@
         q.buckle_miscellaneous as buckleMiscellaneous,
         q.re_inspector as reInspector,
         q.car_number as carNumber,
+        q.box_no as boxNo,
+        q.box_no_other as boxNoOther,
+        q.title_no as titleNo,
+        q.title_no_other as titleNoOther,
         q.management_type as managementType,
         q.goods_name as goodsName,
         q.confirm,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -88,6 +88,10 @@
         w.payment_id as paymentId,
         w.task_type as taskType,
         w.bin_number as binNumber,
+        w.box_no as boxNo,
+        w.box_no_other as boxNoOther,
+        w.title_no as titleNo,
+        w.title_no_other as titleNoOther,
         w.type,
         w.deduction_weight as deductionWeight,
         w.pure_weight as pureWeight,