Kaynağa Gözat

封仓确认单-性质转变效验

hanqingsong 1 yıl önce
ebeveyn
işleme
219350fefc

+ 0 - 8
src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageSealedConfirmationMapper.xml

@@ -419,14 +419,6 @@
419
       <if test="warehouseId != null and warehouseId != ''">
419
       <if test="warehouseId != null and warehouseId != ''">
420
         and warehouse_id = #{warehouseId}
420
         and warehouse_id = #{warehouseId}
421
       </if>
421
       </if>
422
-      and quality in(
423
-              6864,
424
-              6865,
425
-              6877,
426
-              6878,
427
-              6879,
428
-              6866
429
-            )
430
     </where>
422
     </where>
431
     order by id desc limit 0,1
423
     order by id desc limit 0,1
432
   </select>
424
   </select>

+ 4 - 2
src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageSealedConfirmationImpl.java

@@ -63,7 +63,7 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
63
         }
63
         }
64
         //粮情卡功能校验取数用到
64
         //粮情卡功能校验取数用到
65
         if (!ObjectUtils.isEmpty(param.getApplyTime())) {
65
         if (!ObjectUtils.isEmpty(param.getApplyTime())) {
66
-        	criteria.andApplyTimeGreaterThanOrEqualTo(ParameterUtil.string2datetime(param.getApplyTime()));
66
+            criteria.andApplyTimeGreaterThanOrEqualTo(ParameterUtil.string2datetime(param.getApplyTime()));
67
         }
67
         }
68
         return confirmationMapper.selectByExample(example);
68
         return confirmationMapper.selectByExample(example);
69
     }
69
     }
@@ -137,11 +137,13 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
137
             Integer grainAttribute = confirmationMapper.checkNoticeReceive(orgId, houseId, warehouseId);
137
             Integer grainAttribute = confirmationMapper.checkNoticeReceive(orgId, houseId, warehouseId);
138
             // 未做性质转变
138
             // 未做性质转变
139
             if (ObjectUtils.isEmpty(grainAttribute)) {
139
             if (ObjectUtils.isEmpty(grainAttribute)) {
140
-                return confirmation;
140
+                return null;
141
             } else {
141
             } else {
142
                 // 对比粮食性质是否为储备粮
142
                 // 对比粮食性质是否为储备粮
143
                 if (6864 == grainAttribute || 6865 == grainAttribute || 6877 == grainAttribute || 6878 == grainAttribute || 6879 == grainAttribute || 6866 == grainAttribute) {
143
                 if (6864 == grainAttribute || 6865 == grainAttribute || 6877 == grainAttribute || 6878 == grainAttribute || 6879 == grainAttribute || 6866 == grainAttribute) {
144
                     confirmation.setGrainAttribute(grainAttribute);
144
                     confirmation.setGrainAttribute(grainAttribute);
145
+                } else {
146
+                    return null;
145
                 }
147
                 }
146
             }
148
             }
147
         }
149
         }