修改

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

@@ -349,6 +349,21 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     @TableField(exist = false)
     private Date endDate;
 
+    /**
+     * 打印开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date printStartDate;
+    /**
+     * 打印结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date printEndDate;
+
     /**
      * 质检员
      */

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

@@ -534,6 +534,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             }
             qualityInspectionManagement1.setNatureOfGrainPurchase("贸易粮");
             qualityInspectionManagement1.setServiceManagementType("3");
+            if(qualityInspectionManagement1.getContractNo() != null){
+                qualityInspectionManagement1.setContractNo(qualityInspectionManagement1.getContractNo());
+            }
             qualityInspectionManagement1.setQualityNo(qualityInspectionManagement1.getQualityNo());
             qualityInspectionManagement1.setCustomerName(qualityInspectionManagement1.getCustomerName());
             qualityInspectionManagement1.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
@@ -558,6 +561,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             WeighingManagement weighingManagement = new WeighingManagement();
             weighingManagement.setId(IdGenerator.generateUUID());
             weighingManagement.setRelationId(relationId);
+            if(qualityInspectionManagement1.getContractNo() != null) {
+                weighingManagement.setContractNo(qualityInspectionManagement1.getContractNo());
+            }
             weighingManagement.setNumber(qualityInspectionManagement1.getQualityNo());
             weighingManagement.setCustomer(qualityInspectionManagement1.getCustomerName());
             weighingManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
@@ -588,10 +594,13 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             paymentManagement.setId(IdGenerator.generateUUID());
             paymentManagement.setRelationId(relationId);
             paymentManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
-            paymentManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
+            if(qualityInspectionManagement1.getContractNo() != null) {
+                paymentManagement.setContractNo(qualityInspectionManagement1.getContractNo());
+            }
             paymentManagement.setPaymentNo(qualityInspectionManagement1.getQualityNo());
             paymentManagement.setCustomerName(qualityInspectionManagement1.getCustomerName());
             paymentManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            paymentManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
             paymentManagement.setCarNo(qualityInspectionManagement1.getCarNumber());
             if(qualityInspectionManagement1.getGoodsName() != null){
                 paymentManagement.setGoodsName(qualityInspectionManagement1.getGoodsName());

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

@@ -2328,6 +2328,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("searchKeyWord", warehouseInOutInfo.getSearchKeyWord());
         pageView.put("startDate", warehouseInOutInfo.getStartDate());
         pageView.put("endDate", warehouseInOutInfo.getEndDate());
+        pageView.put("printStartDate", warehouseInOutInfo.getPrintStartDate());
+        pageView.put("printEndDate", warehouseInOutInfo.getPrintEndDate());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
         pageView.put("warehouseName", warehouseInOutInfo.getWarehouseName());
         pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());

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

@@ -90,6 +90,7 @@
         and cci.identity_id = i.id
         AND a.comp_id = #{compId}
         AND a.management_type = '1'
+        AND a.contract_no is not null
         <if test="warehouseName != null and warehouseName != ''">
             AND a.warehouse_name= #{warehouseName}
         </if>

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

@@ -151,6 +151,14 @@
             AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") <=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
+        <if test="printStartDate != null">
+            AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%m%s") &gt;=
+            DATE_FORMAT(#{printStartDate},"%Y%m%d%H%m%s"))
+        </if>
+        <if test="printEndDate != null">
+            AND (DATE_FORMAT(w.update_date,"%Y%m%d%H%m%s") &lt;=
+            DATE_FORMAT(#{printEndDate},"%Y%m%d%H%m%s"))
+        </if>
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>