1

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

@@ -315,9 +315,6 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     public String addQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
         String relationId=IdGenerator.generateUUID();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
-        if(qualityInspectionManagement.getQualityNo().contains("null")){
-            throw new YException(YExceptionEnum.QUALITY_HAVE_ERROR);
-        }
         if(qualityInspectionManagement.getCompId() == null || qualityInspectionManagement.getCompId().isEmpty()){
             qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }
@@ -345,6 +342,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             String Number = qualityInspectionManagement.getNumberLetter() + date + qualityInspectionManagement.getWarehouseNo() + "0001";
             qualityInspectionManagement.setQualityNo(Number);
         }
+        if(qualityInspectionManagement.getQualityNo().contains("null")){
+            throw new YException(YExceptionEnum.QUALITY_HAVE_ERROR);
+        }
         //判断质检编号是否唯一
         List<QualityInspectionManagement> qualityInspectionManagements =
                 this.selectList(new EntityWrapper<QualityInspectionManagement>()

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

@@ -191,6 +191,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 if (!StringUtils.isEmpty(warehousingOrder.getSearchType())) {
                     warehousingOrderWrapper.gt("amount_not_payable", 0);
                 }
+                if ("2".equals(warehousingOrder.getSearchType())) {
+                    warehousingOrderWrapper.eq("batch_id", warehousingOrder1.getBatchId());
+                }
                 if (!StringUtils.isEmpty(warehousingOrder.getFlag())) {
                     if ("0".equals(warehousingOrder.getFlag())){
                         warehousingOrderWrapper.gt("profit_and_loss", 0);
@@ -625,7 +628,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         for (WarehousingOrder warehousingOrder2 : warehousingOrderList) {
                             warehousingOrder2.setStatusFlag(StatusEnum.PENDING_PAYMENT.getFlag());
                             warehousingOrder2.setStatus(StatusEnum.PENDING_PAYMENT.getName());
-                            warehousingOrder2.setWorkflowId(workflowId);
+//                            warehousingOrder2.setWorkflowId(workflowId);
                             warehousingOrder2.setBatchId(batchId);
                             this.updateById(warehousingOrder2);
                         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/WarehousingOrderListener.java

@@ -43,7 +43,7 @@ public class WarehousingOrderListener extends AbstractWorkflowTaskListener {
     public void handleRejectApplicationRepulsed(String workflowId, String businessKey, boolean needReapply) {
         List<WarehousingOrder> list = warehousingOrderService.selectList(new EntityWrapper<WarehousingOrder>().eq("batch_id",businessKey));
         for(WarehousingOrder warehousingOrder : list){
-            warehousingOrder = warehousingOrderService.selectById(businessKey);
+            warehousingOrder = warehousingOrderService.selectById(warehousingOrder.getId());
             if (warehousingOrder == null) {
                 return;
             }

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

@@ -43,7 +43,7 @@
         <if test="businessKeys != null and businessKeys.size > 0">
             and(
             <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-                a.id = #{businessValue}
+                batch_id = #{businessValue}
             </foreach>
             )
         </if>
@@ -57,6 +57,7 @@
         w.comp_id as compId,
         w.warehouse_name as warehouseName,
         wbi.warehouse_type as warehouseType,
+        w.batch_id as batchId,
         w.issuing_time as issuingTime
         FROM warehousing_order w
         LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
@@ -95,7 +96,7 @@
         <if test="businessKeys != null and businessKeys.size > 0">
             and(
             <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-                a.id = #{businessValue}
+                w.batch_id = #{businessValue}
             </foreach>
             )
         </if>