问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderSelectDto.java

@@ -69,4 +69,9 @@ public class ProduceOrderSelectDto extends BaseSelectDto {
      */
     private Long contractCompanyId;
 
+    /**
+     * 生产状态反向过滤
+     */
+    private String neProduceStatus;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -157,6 +157,12 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             wrapper.eq("c.contract_type", dto.getContractType());
         }
 
+        //不显示指定类型数据
+        String neProduceStatus = dto.getNeProduceStatus();
+        if (ObjectUtil.isNotEmpty(neProduceStatus)) {
+            wrapper.notIn(ProductionOrder::getProduceStatus, neProduceStatus.split(","));
+        }
+
         Page<ProductionOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -116,6 +116,8 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
                 BigDecimal payAmount = payDetails.stream().map(PayDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                 result.setPayAmount(payAmount);
             }
+
+            result.setPurchaseCode(purchase.getCode());
         }
 
 

hx-sale/src/main/resources/mapper/ext/ExtQuotationProductMapper.xml

@@ -8,7 +8,7 @@
                sq.`code` AS quotationCode
         FROM ext_quotation_product eqp
                  JOIN ext_quotation eq ON eqp.sale_quotation_id = eq.id
-                 JOIN sale_quotation sq ON eq.sale_quotation_id
+                 JOIN sale_quotation sq ON eq.sale_quotation_id = sq.id
             ${ew.customSqlSegment}
     </select>
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -137,4 +137,9 @@ public class StockVo extends Stock {
 
     private String companyName;
 
+    /**
+     * 可用库存
+     */
+    private BigDecimal availableQuantity;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -81,4 +81,9 @@ public class StockWaitDetailsVo extends StockWaitDetails {
     private BigDecimal productHeight;
     private String productColor;
 
+    /**
+     * 可用库存
+     */
+    private BigDecimal availableQuantity;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -126,6 +126,16 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         List<ProductClassify> productClassifyList = productClassifyService.list();
         Map<Long, ProductClassify> productClassifyMap = productClassifyList.stream().collect(Collectors.toMap(BaseIdPo::getId, Function.identity()));
 
+        //赋值可用库存信息
+        List<Long> pIds = stockVos.stream().map(Stock::getProductId).collect(Collectors.toList());
+        Map<Long, BigDecimal> productStockInfoMap = productStockInfoService.mapKV(ProductStockInfo::getProductId, ProductStockInfo::getAvailableQuantity, q -> q
+                .in(ProductStockInfo::getProductId, pIds)
+                .eq(ProductStockInfo::getCompanyId, SecurityUtils.getCompanyId())
+        );
+        for (StockVo stockVo : stockVos) {
+            stockVo.setAvailableQuantity(productStockInfoMap.getOrDefault(stockVo.getProductId(), BigDecimal.ZERO));
+        }
+
         //获取部门列表
         List<SysDept> deptList = sysDeptService.list();
         Map<Long, String> sysDeptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.entity.InOutBo;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.item.entity.product.po.ProductStockInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.item.service.product.ProductStockInfoService;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
@@ -61,14 +63,16 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private ProductStockInfoService productStockInfoService;
 
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
 
         //权限过滤：待出入库
-            wrapper.in("sw", StockWait::getCompanyId, SecurityUtils.getCompanyIds());
-            wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
+        wrapper.in("sw", StockWait::getCompanyId, SecurityUtils.getCompanyIds());
+        wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
 
 
         //状态过滤
@@ -121,6 +125,18 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             item.setProductSpec(productInfo.getSpec());
             item.setProductDefinition(productInfo.getDefinition());
         });
+
+        //赋值可用库存信息
+        List<Long> pIds = voList.stream().map(StockWaitDetails::getProductId).collect(Collectors.toList());
+        Map<Long, BigDecimal> productStockInfoMap = productStockInfoService.mapKV(ProductStockInfo::getProductId, ProductStockInfo::getAvailableQuantity, q -> q
+                .in(ProductStockInfo::getProductId, pIds)
+                .eq(ProductStockInfo::getCompanyId, SecurityUtils.getCompanyId())
+        );
+        for (StockWaitDetailsVo stockWaitDetailsVo : voList) {
+            stockWaitDetailsVo.setAvailableQuantity(productStockInfoMap.getOrDefault(stockWaitDetailsVo.getProductId(), BigDecimal.ZERO));
+        }
+
+
         Map<Long, List<StockWaitDetailsVo>> voMap = voList.stream().collect(Collectors.groupingBy(StockWaitDetails::getStockWaitId));
 
         //赋值明细列表