更新

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/StaffController.java

@@ -7,8 +7,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.winsea.svc.base.security.service.IAccountService;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -59,6 +63,8 @@ public class StaffController {
 	@SofaReference
 	private ICommonRoleService roleService;
 
+	@Autowired
+	private IWarehouseBaseInfoService warehouseBaseInfoService;
 	/**
 	 * 获取当前登录用户信息
 	 *
@@ -121,7 +127,24 @@ public class StaffController {
 		return staffService.selectList(new EntityWrapper<CommonStaff>().eq("comp_id", compId));
 	}
 
+	/**
+	 * 根据公司ID和库点id获得有权限的人员集合
+	 *
+	 * @param compId
+	 * @return
+	 */
+	@GetMapping("/query/getStaffListByCompIdAndWarehouseId")
+	public List<CommonStaff> getStaffListByCompId(String compId,String warehouseId) {
+		if(warehouseId != null && !warehouseId.isEmpty()){
+			WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseId);
+			String phones = warehouseBaseInfo.getPersonPhone()+","+warehouseBaseInfo.getOtherPersonPhone();
 
+			return staffService.selectList(new EntityWrapper<CommonStaff>().eq("comp_id", compId).in("staff_mobile_phone",phones));
+		}
+		else{
+			return staffService.selectList(new EntityWrapper<CommonStaff>().eq("comp_id", compId));
+		}
+	}
 
 
 	/**

winsea-haixin-platform-backend/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9100
+  port: 8090
 
 spring:
   application:
@@ -7,7 +7,7 @@ spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     password: Ccj841968545
-    url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
   redis:
     database: 0

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -81,6 +81,12 @@ auth:
     - /noticeTask/**/*
     - /notice/*
     - /notice/**/*
+    - /paymentManagement/*
+    - /paymentManagement/**/*
+    - /qualityInspectionManagement/*
+    - /qualityInspectionManagement/**/*
+    - /weighingManagement/*
+    - /weighingManagement/**/*
   expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout

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

@@ -55,6 +55,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 质量扣款
      */
     private Float qualityDeduction;
+    /**
+     * 扣单价
+     */
+    private Float unitDeduction;
     /**
      * 编号
      */

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

@@ -80,7 +80,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
-        if (resourceIdList.contains("procurementInReport-Edit")) { // 填写，提交    权限做完以后替换
+        if (resourceIdList != null && resourceIdList.contains("procurementInReport-Edit")) { // 填写，提交    权限做完以后替换
             List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
             statusSet.addAll(statusList);
         }
@@ -483,6 +483,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 
     private List<String> getResourceIdList() {
         User currentUser = AuthSecurityUtils.getCurrentUserInfo();
+        if(currentUser == null){
+            return null;
+        }
         // 当前登录人主要角色
         return roleResourceService.getBindResourcesByUserId(currentUser.getUserId()).stream()
                 .map(CommonRoleResource::getResourceId).collect(Collectors.toList());

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

@@ -60,6 +60,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("currentPage",qualityInspectionManagement.getCurrentPage());
         pageView.put("warehouseName",qualityInspectionManagement.getWarehouseName());
         pageView.put("managementType",qualityInspectionManagement.getManagementType());
+
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);
@@ -123,7 +124,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      * @return
      */
     @Override
-        public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+    public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
         boolean one=this.updateById(qualityInspectionManagement);
         //成功返回ok
         if (one ) {
@@ -156,6 +157,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     public String addQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
         String relationId=IdGenerator.generateUUID();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
+        if(qualityInspectionManagement.getCompId() == null || qualityInspectionManagement.getCompId().isEmpty()){
+            qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         qualityInspectionManagement.setRelationId(relationId);
         qualityInspectionManagement.setManagementType("1");
         qualityInspectionManagement.setQualityDate(new Date());

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

@@ -75,18 +75,245 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<WarehouseView> selectWarehouseViewinfo(String compId, String warehouseName, String warehouseType) {
+        if(compId == null || compId.isEmpty()){
+            compId=AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
+        }
+        String personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
+
         List<WarehouseView> warehouseViews = new ArrayList<>();
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
+        Wrapper<WarehouseBaseInfo> wrapper = new EntityWrapper<>();
         warehouseBaseInfoWrapper.eq(WarehouseBaseInfo.QueryFiles.COMP_ID, compId)
                 .eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq(WarehouseBaseInfo.QueryFiles.SHOW_FLAG, NumberConstant.CONSTANT1).eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE, warehouseType);
+                .eq(WarehouseBaseInfo.QueryFiles.SHOW_FLAG, NumberConstant.CONSTANT1);
+        wrapper.eq(WarehouseBaseInfo.QueryFiles.COMP_ID, compId)
+                .eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(WarehouseBaseInfo.QueryFiles.SHOW_FLAG, NumberConstant.CONSTANT1);
         if (!StringUtils.isEmpty(warehouseName)) {
             warehouseBaseInfoWrapper.like(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, "%" + warehouseName + "%");
+            wrapper.like(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, "%" + warehouseName + "%");
         }
-        // 查出所有仓库
-        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
-        if (NumberConstant.CONSTANT1.equals(warehouseType)) {
+        if(!StringUtils.isEmpty(warehouseType)){
+            if(!personCharge.equals("13333333333")){
+                warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
+                        .like("other_person_charge", personCharge);
+
+            }
+            warehouseBaseInfoWrapper.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE, warehouseType);
+            // 查出所有仓库
+            List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
+            if (NumberConstant.CONSTANT1.equals(warehouseType)) {
+                if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                    for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                        // 以库位为维度查询
+                        List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId()));
+                        if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                            for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
+                                WarehouseView warehouseView = new WarehouseView();
+                                warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                                warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                                warehouseView.setBinNumberId(warehousePositionInfo.getId());
+                                warehouseView.setBinNumber(warehousePositionInfo.getBinNumber());
+                                warehouseView.setCapacity(String.valueOf(warehousePositionInfo.getMaxStorage()));
+                                warehouseView.setRemark(warehousePositionInfo.getRemark());
+                                // 定义待完成数量
+                                int count = 0;
+                                // 定义应余量
+                                String storage = "";
+                                //定义入库
+                                String inNetWeight = "";
+                                // 子集合
+                                List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                                // 查询入库数量
+                                List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                                    for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                        WarehouseNumView warehouseNumView = new WarehouseNumView();
+                                        // 查询入库数量
+                                        List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                                .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
+                                                .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+
+                                        if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                            Float netWeight = 0f;
+                                            for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                                netWeight = netWeight + warehouse.getNetWeight();
+                                            }
+                                            warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                            warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                            if (StringUtils.isEmpty(inNetWeight)) {
+                                                inNetWeight = "0";
+                                            }
+                                            inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
+                                        }
+                                        // 查询应余量
+                                        WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                                                .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                        if (warehousePositionStorageInfo != null) {
+                                            storage = String.valueOf(warehousePositionStorageInfo.getStorage());
+                                        } else {
+                                            storage = "";
+                                        }
+                                        warehouseNumView.setStorage(storage);
+                                        warehouseNumViewList.add(warehouseNumView);
+                                    }
+
+                                }
+
+                                //定义出库
+                                String outNetWeight = "";
+                                // 查询出库数量
+                                List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                                    for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                                        Float netWeight = 0f;
+                                        outNetWeight = "0";
+                                        List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                                .eq("status_flag", "3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                        if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                            for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                                netWeight = netWeight + warehouse.getNetWeight();
+                                            }
+                                            if (StringUtils.isEmpty(outNetWeight)) {
+                                                outNetWeight = "0";
+                                            }
+                                            outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
+                                        }
+                                        for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
+                                            if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
+                                                warehouseNumView.setOutNetWeight(outNetWeight);
+                                            }
+
+                                        }
+                                    }
+
+                                }
+                                // 查询入库数量
+                                count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("position_id", warehousePositionInfo.getId())
+                                        .eq("status_flag", "1"));
+                                warehouseView.setNumber(count);
+                                warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                                warehouseViews.add(warehouseView);
+
+                            }
+                        }
+                    }
+
+                }
+
+            } else {
+                if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                    for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                        WarehouseView warehouseView = new WarehouseView();
+                        warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                        warehouseView.setCreateType(warehouseBaseInfo.getCreateType());
+                        warehouseView.setClearStatus(warehouseBaseInfo.getClearStatus());
+                        warehouseView.setClearStatusFlag(warehouseBaseInfo.getClearStatusFlag());
+                        warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                        warehouseView.setUpdateDate(warehouseBaseInfo.getUpdateDate());
+                        warehouseView.setAddress(warehouseBaseInfo.getWarehousePrivate() + warehouseBaseInfo.getWarehouseCity() + warehouseBaseInfo.getWarehouseArea() + warehouseBaseInfo.getDetailedAddress());
+                        // 定义待完成数量
+                        int count = 0;
+                        //定义入库
+                        String inNetWeight = "";
+                        // 子集合
+                        List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                        // 查询入库数量
+                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                WarehouseNumView warehouseNumView = new WarehouseNumView();
+                                // 查询入库数量
+                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "2")
+                                        .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                    Float netWeight = 0f;
+                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                        netWeight = netWeight + warehouse.getNetWeight();
+                                    }
+                                    warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                    warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                    if (StringUtils.isEmpty(inNetWeight)) {
+                                        inNetWeight = "0";
+                                    }
+                                    inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
+                                }
+                                warehouseNumViewList.add(warehouseNumView);
+                            }
+
+                        }
+
+                        //定义出库
+                        String outNetWeight = "";
+                        // 查询出库数量
+                        List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                        if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                                Float netWeight = 0f;
+                                outNetWeight = "0";
+                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("status_flag", "3").eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                        netWeight = netWeight + warehouse.getNetWeight();
+                                    }
+                                    if (StringUtils.isEmpty(outNetWeight)) {
+                                        outNetWeight = "0";
+                                    }
+                                    outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
+                                }
+                                for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
+                                    if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
+                                        warehouseNumView.setOutNetWeight(outNetWeight);
+                                    }
+
+                                }
+                            }
+
+                        }
+                        // 查询入库数量
+                        count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId())
+                                .eq("status_flag", "1"));
+                        warehouseView.setNumber(count);
+                        // 定义待完成数量
+                        int outCount = 0;
+                        outCount = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId())
+                                .eq("in_out_flag", "1")
+                                .eq("status_flag", "1"));
+                        warehouseView.setOutNumber(outCount);
+                        warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                        warehouseViews.add(warehouseView);
+                        // 排序
+                        Comparator<WarehouseView> byClearStatusFlag = Comparator.comparing(WarehouseView::getClearStatusFlag);
+                        Comparator<WarehouseView> byUpdateDate = Comparator.comparing(WarehouseView::getUpdateDate);
+                        warehouseViews.sort(byClearStatusFlag.thenComparing(byUpdateDate));
+                    }
+                }
+
+            }
+        }
+        else{
+            if(!personCharge.equals("13333333333")){
+                warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
+                        .like("other_person_charge", personCharge);
+                wrapper.andNew().eq("person_phone", personCharge).or()
+                        .like("other_person_charge", personCharge);
+            }
+            warehouseBaseInfoWrapper.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE, "1");
+            // 查出常用仓库
+            List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
             if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
                 for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
                     // 以库位为维度查询
@@ -188,8 +415,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 }
 
             }
-
-        } else {
+            // 查出临时仓库
+            wrapper.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE, "2");
+            warehouseBaseInfoList = this.selectList(wrapper);
             if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
                 for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
                     WarehouseView warehouseView = new WarehouseView();
@@ -278,15 +506,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     warehouseView.setWarehouseNumViewList(warehouseNumViewList);
                     warehouseViews.add(warehouseView);
                     // 排序
-                    Comparator<WarehouseView> byClearStatusFlag = Comparator.comparing(WarehouseView::getClearStatusFlag);
-                    Comparator<WarehouseView> byUpdateDate = Comparator.comparing(WarehouseView::getUpdateDate);
-                    warehouseViews.sort(byClearStatusFlag.thenComparing(byUpdateDate));
+//                    Comparator<WarehouseView> byClearStatusFlag = Comparator.comparing(WarehouseView::getClearStatusFlag);
+//                    Comparator<WarehouseView> byUpdateDate = Comparator.comparing(WarehouseView::getUpdateDate);
+//                    warehouseViews.sort(byUpdateDate);
                 }
             }
-
         }
 
 
+
         return warehouseViews;
     }
 

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

@@ -81,6 +81,11 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if(paymentManagement!=null){
                     weighingManagement1.setPaymentManagement(paymentManagement);
                 }
+                QualityInspectionManagement qualityInspectionManagement=qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                        .eq("relation_id",weighingManagement1.getRelationId()));
+                if(qualityInspectionManagement!=null){
+                    weighingManagement1.setQualityInspectionManagement(qualityInspectionManagement);
+                }
                 WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                         .eq("comp_id",weighingManagement1.getCompId())
                         .eq("warehouse_name",weighingManagement1.getWarehouseName()));

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

@@ -55,16 +55,16 @@
         and delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '1'
+                AND task_status_key  = '1'
             </if>
             <if test="searchType == 2">
-                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '3'
+                AND task_status_key  = '3'
             </if>
             <if test="searchType == 3">
-                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '5'
+                AND task_status_key  = '5'
             </if>
             <if test="searchType == 4">
-                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '7'
+                AND task_status_key  = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">