问题处理

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -297,9 +297,9 @@ public class ContractUpdateFlow extends FlowDelegate {
             //生成操作可用库存的实体
             AvailableStockBo availableStockBo = new AvailableStockBo();
             availableStockBo.setProductId(materialId);
-            availableStockBo.setQuantity(null);
+            availableStockBo.setQuantity(BigDecimal.ZERO);
             availableStockBo.setNewQuantity(newPurchaseProduct.getQuantity());
-            availableStockBo.setInStockQuantity(null);
+            availableStockBo.setInStockQuantity(BigDecimal.ZERO);
             availableStockBo.setDemandPurchaseCount(BigDecimal.ZERO);
 
             availableStockBoList.add(availableStockBo);

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -347,15 +347,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
 
-            //归属公司
-            List<SysDept> companyList = deptService.list(Wrappers.<SysDept>query().eq("type", 0));
-            List<Long> companyIds = companyList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
             wrapper.and(q -> q
                     .like("t1", Contract::getCode, dto.getKeyword())
                     .or().like("t1", Contract::getUserName, dto.getUserName())
                     .or().in("t1", Contract::getSellCorporationId, corporationIds)
                     .or().in("t1", Contract::getBuyCorporationId, customerIds)
-                    .or().in("t1", Contract::getCompanyId, companyIds)
             );
         }