BUG修护

hx-ehsd/src/main/java/com/fjhx/ehsd/entity/sample/po/Sample.java

@@ -166,11 +166,6 @@ public class Sample extends BasePo {
     private String remark;
 
     /**
-     * 版本号
-     */
-    private String versions;
-
-    /**
      * 交期
      */
     private String deliveryTime;
@@ -220,6 +215,10 @@ public class Sample extends BasePo {
      */
     private String beneficiaryAccountNumber;
 
+    /**
+     * 提交类型
+     */
+    private String submitType;
 
     /**
      * 样品单产品列表

hx-ehsd/src/main/java/com/fjhx/ehsd/service/sample/impl/SampleServiceImpl.java

@@ -49,6 +49,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     public Page<SampleVo> getPage(SampleSelectDto dto) {
         IWrapper<Sample> wrapper = getWrapper();
         wrapper.orderByDesc("s", Sample::getCreateTime);
+        wrapper.between("s",Sample::getStatus,0,87);
         if(StringUtils.isNotEmpty(dto.getStatus())){
             wrapper.eq("s",Sample::getStatus,dto.getStatus());
         }

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -113,18 +113,18 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         purchase.setArrivalStatus(arrival.getArrivalStatus());
         purchase.setId(arrival.getPurchaseId());
         purchaseService.updateById(purchase);
-//        Purchase purchase1 = purchaseService.getById(arrival.getPurchaseId());
+        Purchase purchase1 = purchaseService.getById(arrival.getPurchaseId());
         //取出到货明细
         List<ArrivalDetail> arrivalDetailList = arrival.getArrivalDetailList();
         if (CollectionUtils.isNotEmpty(arrivalDetailList)) {
-//            StockWait stockWait = new StockWait();
-//            stockWait.setBusinessId(purchase1.getId());//采购id
-//            stockWait.setBusinessCode(purchase1.getCode());//采购id
-//            stockWait.setType(1);//入库
-//            stockWait.setStatus(0);//待入库
-//            stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
-//            stockWaitService.save(stockWait);
-//            List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
+            StockWait stockWait = new StockWait();
+            stockWait.setBusinessId(purchase1.getId());//采购id
+            stockWait.setBusinessCode(purchase1.getCode());//采购编码
+            stockWait.setType(1);//入库
+            stockWait.setStatus(0);//待入库
+            stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
+            stockWaitService.save(stockWait);
+            List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
             for (ArrivalDetail d : arrivalDetailList) {
                 //todo 这一块是做了采购到货状态修改。前端已经完成
                 //查询采购明细
@@ -137,14 +137,14 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 //
 //                }
                 d.setArrivalId(arrival.getId());
-//                StockWaitDetails stockWaitDetails = new StockWaitDetails();
-//                stockWaitDetails.setStockWaitId(stockWait.getId());
-//                stockWaitDetails.setProductId(d.getBussinessId());
-//                stockWaitDetails.setQuantity(d.getCount());
-//                stockWaitDetailsList.add(stockWaitDetails);
+                StockWaitDetails stockWaitDetails = new StockWaitDetails();
+                stockWaitDetails.setStockWaitId(stockWait.getId());
+                stockWaitDetails.setProductId(d.getBussinessId());
+                stockWaitDetails.setQuantity(d.getCount());
+                stockWaitDetailsList.add(stockWaitDetails);
             }
             arrivalDetailService.saveBatch(arrivalDetailList);
-//            stockWaitDetailsService.saveBatch(stockWaitDetailsList);
+            stockWaitDetailsService.saveBatch(stockWaitDetailsList);
         }
     }
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -19,4 +19,9 @@ public class ContractSelectDto extends BaseSelectDto {
      */
     private String status;
 
+    /**
+     * 归属公司ID
+     */
+    private String sellCorporationId;
+
 }

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

@@ -101,9 +101,13 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public Page<ContractVo> getPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getWrapper();
         wrapper.orderByDesc("t1",Contract::getCreateTime);
+        wrapper.between("t1",Contract::getStatus,0,87);
         if(StringUtils.isNotEmpty(dto.getStatus())){
             wrapper.eq("t1",Contract::getStatus,dto.getStatus());
         }
+        if(StringUtils.isNotEmpty(dto.getSellCorporationId())){
+            wrapper.eq("t1",Contract::getSellCorporationId,dto.getSellCorporationId());
+        }
         if(StringUtils.isNotEmpty(dto.getKeyword())){
             wrapper.keyword(dto.getKeyword(),new SqlField("t1",Contract::getCode));
         }