修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SearchRecordsInfo.java

@@ -48,6 +48,7 @@ public class SearchRecordsInfo extends BaseModel<SearchRecordsInfo> {
     private Long searchCount;
     /**
      * 功能类型
+     * 1交易2粮脉3收购客户
      */
     private String functionType;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
@@ -460,6 +461,9 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     @Override
     public List<IdentityAuthenticationInfo> identityAuthenticationInfoCustomer(IdentityAuthenticationInfo identityAuthenticationInfo) {
         Map<String, Object> pageView = new HashMap<>();
+        if(identityAuthenticationInfo.getCompId() == null || identityAuthenticationInfo.getCompId().isEmpty()){
+            identityAuthenticationInfo.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         //公司id
         pageView.put("compId", identityAuthenticationInfo.getCompId());
         pageView.put("authenticationStatusKey", identityAuthenticationInfo.getAuthenticationStatusKey());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -214,6 +214,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setStatusFlag(StatusEnum.TO_BE_SETTLED.getFlag());
                 paymentManagement1.setNetWeight(weighingManagement.getNetWeight());
                 paymentManagement1.setManagementType("1");
+                paymentManagement1.setGrossWeight(weighingManagement1.getGrossWeight());
+                paymentManagement1.setTare(weighingManagement.getTare());
                 paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
                 //质检信息
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()