功能修改

lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java

@@ -152,4 +152,10 @@ public class Apply extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private Date endTime;
+
+    /**
+     * 申领人部门
+     */
+    @TableField(exist = false)
+    private String applyUserDept;
 }

lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java

@@ -114,4 +114,9 @@ public class Goods extends BaseEntity {
 	// 出库数量
 	@TableField(exist = false)
 	private Integer outNum;
+
+	// 未到货数量
+	@TableField(exist = false)
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Integer notNum;
 }

lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/ProductStoreDetialController.java

@@ -2,39 +2,33 @@
 package org.springblade.lims.capital.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.apache.poi.ss.formula.functions.Now;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.lims.capital.entity.ApplyOrder;
 import org.springblade.lims.capital.entity.ProductStore;
-import org.springblade.lims.capital.service.IProductStoreService;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.lims.capital.entity.ProductStoreDetial;
-import org.springblade.lims.capital.vo.ProductStoreDetialVO;
 import org.springblade.lims.capital.service.IProductStoreDetialService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.lims.capital.service.IProductStoreService;
+import org.springblade.lims.capital.vo.ProductStoreDetialVO;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
 
-import static javafx.scene.input.KeyCode.N;
-
 /**
  *  控制器
  *

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java

@@ -86,7 +86,13 @@ public class ApplyController extends BladeController {
         }
         // 按照时间倒序
         wrapper.orderByDesc(Apply::getCreateTime);
-        return applyService.page(Condition.getPage(query), wrapper);
+        IPage<Apply> page = applyService.page(Condition.getPage(query), wrapper);
+        if(CollectionUtils.isNotEmpty(page.getRecords())){
+            page.getRecords().forEach(item ->{
+                item.setApplyUserDept(sysClient.getDeptName(item.getCreateDept()).getData());
+            });
+        }
+        return page;
     }
 
     /**
@@ -388,6 +394,7 @@ public class ApplyController extends BladeController {
         Map<String, Object> map = new HashMap<>(2);
         // 申领单
         Apply apply1 = applyService.getById(apply.getId());
+        apply1.setApplyUserDept(sysClient.getDeptName(apply1.getCreateDept()).getData());
         map.put("apply", apply1);
         // 申领详情
         LambdaQueryWrapper<ApplyDetail> wrapper = new LambdaQueryWrapper<>();
@@ -412,6 +419,7 @@ public class ApplyController extends BladeController {
     public R<Apply> applyInfo(Apply apply) {
         // 申领单
         Apply apply1 = applyService.getById(apply.getId());
+        apply1.setApplyUserDept(sysClient.getDeptName(apply1.getCreateDept()).getData());
         // 申领详情
         LambdaQueryWrapper<ApplyDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ApplyDetail::getApplyId, apply.getId());

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -16,6 +17,7 @@ import org.apache.commons.lang.math.RandomUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -32,10 +34,7 @@ import org.springblade.lims.capital.service.IGoodsCheckLogService;
 import org.springblade.lims.capital.service.IProductClassService;
 import org.springblade.lims.capital.service.IProductStoreDetialService;
 import org.springblade.lims.goods.entity.*;
-import org.springblade.lims.goods.service.IApplyDetailService;
-import org.springblade.lims.goods.service.IApplyService;
-import org.springblade.lims.goods.service.IGoodsService;
-import org.springblade.lims.goods.service.IReportService;
+import org.springblade.lims.goods.service.*;
 import org.springblade.resource.enums.SysTypeEnum;
 import org.springblade.resource.feign.IMessageClient;
 import org.springblade.system.cache.DictBizCache;
@@ -80,6 +79,8 @@ public class GoodsController extends BladeController {
 
     private final IApplyService applyService;
 
+    private final IContractDetailService contractDetailService;
+
     //物品列表 分页
     @GetMapping("/list")
     public IPage<Goods> list(Goods goods, Query query) {
@@ -97,7 +98,9 @@ public class GoodsController extends BladeController {
         if (goods.getBigClassId() != null) {
             queryWrapper.eq(Goods::getBigClassId, goods.getBigClassId());
         }
-        queryWrapper.orderByDesc(Goods::getCreateTime);
+        if(StringUtils.isBlank(query.getDescs()) && StringUtils.isBlank(query.getAscs())){
+            queryWrapper.orderByDesc(Goods::getCreateTime);
+        }
         IPage<Goods> page = goodsService.page(Condition.getPage(query), queryWrapper);
         List<Goods> goodsList = page.getRecords();
         for (Goods goods1 : goodsList) {
@@ -106,6 +109,10 @@ public class GoodsController extends BladeController {
             wrapper.eq(ProductStoreDetial::getStatus, 0);
             List<ProductStoreDetial> list = productStoreDetialService.list(wrapper);
             goods1.setCount(list.size());
+            ContractDetail contractDetail = contractDetailService.getOne(Wrappers.<ContractDetail>lambdaQuery().eq(ContractDetail::getGoodsId,goods1.getId()).eq(BaseEntity::getIsDeleted,0));
+            if(contractDetail != null){
+                goods1.setNotNum(contractDetail.getNotNum());
+            }
         }
         return page;
     }