Merge remote-tracking branch 'origin/master'

hx-admin/src/main/resources/application-test.yml

@@ -69,6 +69,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_dingding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                ehsd:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerUserServiceImpl.java

@@ -1,9 +1,11 @@
 package com.fjhx.customer.service.customer.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.customer.entity.customer.po.CustomerUser;
 import com.fjhx.customer.mapper.customer.CustomerUserMapper;
 import com.fjhx.customer.service.customer.CustomerUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.customer.entity.customer.vo.CustomerUserVo;
@@ -50,6 +52,13 @@ public class CustomerUserServiceImpl extends ServiceImpl<CustomerUserMapper, Cus
 
     @Override
     public void add(CustomerUserDto customerUserDto) {
+        if(ObjectUtil.isEmpty(customerUserDto.getCustomerId())){
+            throw new ServiceException("客户id不能为空");
+        }
+        List<CustomerUser> list = this.list(q -> q.eq(CustomerUser::getCustomerId, customerUserDto.getCustomerId()).eq(CustomerUser::getEmail, customerUserDto.getEmail()));
+        if(ObjectUtil.isNotEmpty(list)){
+            throw new ServiceException("邮箱不能重复");
+        }
         this.save(customerUserDto);
     }
 

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));
         }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.service.quality.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -17,7 +18,6 @@ import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
 import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
 import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
 import com.fjhx.victoriatourist.service.quality.QualityInfoService;
-import com.fjhx.victoriatourist.utils.CodeEnum;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecords;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecordsDetails;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -125,7 +125,17 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         arrivalStockRecords.setQualityStatus(2);//质检完成
 
         //根据到货编号生成质检编号
-        qualityInfoDto.setCode(arrivalStockRecords.getArrivalCode() + CodeEnum.QUALITY.getCode());
+        Integer codeNum = 0;
+        String itemPrefix = arrivalStockRecords.getArrivalCode();
+        QualityInfo qualityInfo = this.query()
+                .likeRight("code", itemPrefix).
+                orderByDesc("code").last("limit 1")
+                .one();
+        if (ObjectUtil.isNotEmpty(qualityInfo)) {
+            codeNum = Convert.toInt(qualityInfo.getCode().substring(itemPrefix.length() + 1));
+        }
+        String code = String.format("%s-%0" + 3 + "d", itemPrefix, codeNum + 1);
+        qualityInfoDto.setCode(code);
 
         qualityInfoDto.setWarehouseId(arrivalStockRecords.getWarehouseId());
         //查询入库明细

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/utils/CodeEnum.java

@@ -29,9 +29,7 @@ public enum CodeEnum {
     //京东退货质检
     JD_BACK_QUALITY("PA", "yyMM-", "code", 3, JdBackQualityDetailsService.class),
     //异常记录
-    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class),
-    //到货质检
-    QUALITY("", null, "code", 3, QualityInfoService.class);
+    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;