zhangyuewww 3 gadi atpakaļ
vecāks
revīzija
fdbf45fd0c

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

@@ -3723,6 +3723,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 .eq("relation_id", weighingManagement.getRelationId())
                                 .eq("comp_id", commonStaff.getCompId()));
                         if (qualityInspectionManagement != null) {
+                            qualityInspectionManagement.setCarNumber(warehouseInOutInfo.getCarNo());
                             //状态改为已称毛重
 //                      qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
 //                      qualityInspectionManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());

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

@@ -143,6 +143,7 @@
             wio.delete_flag = '0'
             and wio.status ='已提交'
             and wio.in_out_type ='采购入库'
+            and wbi.warehouse_type='1'
             and wio.update_date> #{beforeDay}
         group BY wio.warehouse_name,wio.contract_no,DATE_FORMAT(wio.update_date,"%Y%m%d")
     </select>
@@ -234,7 +235,6 @@
         WHERE
             (wioi.in_out_type = '收购入库' OR wioi.in_out_type = '采购入库')
             AND wioi.status_flag = '3'
-            AND wbi.comp_id = #{compId}
             and wioi.update_date> #{beforeDay}
         GROUP BY
             case when (wioi.goods_name not like '%潮粮%' and wioi.goods_name like '%玉米%') then  '玉米'  else wioi.goods_name end;