修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/IdentityAuthenticationInfoController.java

@@ -77,7 +77,7 @@ public class IdentityAuthenticationInfoController {
      * @return
      */
     @GetMapping("/api/getIdentityAuthenticationInfo")
-    public IdentityAuthenticationInfo getIdentityAuthenticationInfo(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo){
+    public IdentityAuthenticationInfo getIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo){
         return iIdentityAuthenticationInfoService.getIdentityAuthenticationInfo(identityAuthenticationInfo.getId());
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchaseOrderController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.text.ParseException;
 
 
@@ -60,12 +61,12 @@ public class PurchaseOrderController {
 
     /**
      * 客户点价
-     * @param id
+     * @param purchaseOrder
      * @return
      */
     @PostMapping("/api/pointPrice")
-    public String pointPrice(String id,Float unitPrice) throws ServiceException, ParseException {
-        return purchaseOrderService.pointPrice(id, unitPrice);
+    public String pointPrice(@RequestBody PurchaseOrder purchaseOrder) throws ServiceException, ParseException {
+        return purchaseOrderService.pointPrice(purchaseOrder.getId(), purchaseOrder.getUnitPrice());
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranCarInfoController.java

@@ -9,6 +9,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.ITranTaskInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录车次 前端控制器
@@ -49,7 +51,7 @@ public class TranCarInfoController {
      * @return
      */
     @GetMapping("/api/selectTranCarInfoNum")
-    public Integer selectTranCarInfoNum(@RequestBody TranCarInfo tranCarInfo){
+    public List<TranCarInfo> selectTranCarInfoNum(TranCarInfo tranCarInfo){
         return tranCarInfoService.selectTranCarInfoNum(tranCarInfo);
     }
 

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

@@ -57,6 +57,10 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
      * 附件地址
      */
     private String addressUrl;
+    /**
+     * 身份证附件地址
+     */
+    private String cardAddressUrl;
     /**
      * 司机身份证号码
      */
@@ -77,6 +81,11 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
      * 用户id
      */
     private String commonId;
+    /**
+     * APP端(传0)
+     */
+    @TableField(exist = false)
+    private String pcFlag;
 
     /**
      * 模糊查询
@@ -103,7 +112,7 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
 
         public static final String DISABLE_STATUS_FLAG ="disable_status_flag";
 
-        public static final String DRIVER_NAME = "driver_name";
+        public static final String DRIVER_PHONE = "driver_phone";
 
         public static final String NUMBER_CARD = "number_card";
     }

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

@@ -1,14 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;

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

@@ -254,11 +254,12 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     private String protein;
 
     /**
-     * PC端(传1)
+     * PC端(传1,APP传0)
      */
     @TableField(exist = false)
     private String pcFlag;
 
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -1,12 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录车次 服务类
@@ -33,7 +32,7 @@ public interface ITranCarInfoService extends IService<TranCarInfo> {
      * 查发车数量
      * @param tranCarInfo
      */
-    Integer selectTranCarInfoNum(TranCarInfo tranCarInfo);
+    List<TranCarInfo> selectTranCarInfoNum(TranCarInfo tranCarInfo);
 
 
 }

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

@@ -65,7 +65,7 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
         //判断司机电话是否唯一
         List<DriverViewInfo> driverViewInfos =
                 this.selectList(new EntityWrapper<DriverViewInfo>()
-                        .eq(DriverViewInfo.QueryFiles.DRIVER_NAME, driverViewInfo.getDriverPhone())
+                        .eq(DriverViewInfo.QueryFiles.DRIVER_PHONE, driverViewInfo.getDriverPhone())
                         .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         if (driverViewInfos.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
@@ -172,6 +172,8 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
                 * driverViewInfo.getPageSize());
         //公司id
         pageView.put("compId", driverViewInfo.getCompId());
+        pageView.put("commonId", driverViewInfo.getCommonId());
+        pageView.put("pcFlag", driverViewInfo.getPcFlag());
         pageView.put("residentCityProvincial", driverViewInfo.getResidentCityProvincial());
         pageView.put("residentCityMunicipal", driverViewInfo.getResidentCityMunicipal());
         pageView.put("searchKeyWord", driverViewInfo.getSearchKeyWord());

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

@@ -2,15 +2,12 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.IdentityAuthenticationInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
@@ -19,7 +16,6 @@ import com.yh.saas.plugin.yiliangyiyun.util.MD5Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.sqlite.util.StringUtils;
 
 import java.sql.*;
 import java.util.List;

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

@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -153,6 +152,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                 priceChangeRecord.setPrice(unitPrice);
                 priceChangeRecord.setPriceType("点价");
                 priceChangeRecordService.insert(priceChangeRecord);
+                return "OK";
             }
         }
         return "NG";

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

@@ -1,10 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -18,7 +15,6 @@ import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -48,13 +44,13 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
     public String addTranCar(TranCarInfo tranCarInfo) throws ServiceException {
         //新增主键id
         tranCarInfo.setId(IdGenerator.generateUUID());
-        tranCarInfo.setStatus(StatusEnum.TRAN_DO.getName());
-        tranCarInfo.setStatusFlag(StatusEnum.TRAN_DO.getFlag());
+        tranCarInfo.setStatus(StatusEnum.NOT_DELIVERED.getName());
+        tranCarInfo.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
         tranCarInfo.setConfirmFlag(StatusEnum.NOT_CONFIRM.getFlag());
         //根据手机号判断司机是否认证
         DriverViewInfo driverViewInfo =
                 driverViewInfoService.selectOne(new EntityWrapper<DriverViewInfo>()
-                        .eq(DriverViewInfo.QueryFiles.DRIVER_NAME, tranCarInfo.getDriverPhone())
+                        .eq(DriverViewInfo.QueryFiles.DRIVER_PHONE, tranCarInfo.getDriverPhone())
                         .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         if (driverViewInfo==null) {
             throw new AppServiceException(ExceptionDefinition.DRIVER_NOT_CERTIFIED);
@@ -106,6 +102,7 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
                     tranCarInfo.getStatus(), null, "");
             return "OK";
         }
+
         return "NG";
     }
 
@@ -115,10 +112,11 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
      * @param tranCarInfo
      */
     @Override
-    public Integer selectTranCarInfoNum(TranCarInfo tranCarInfo) {
-        Integer count = this.selectCount(new EntityWrapper<TranCarInfo>()
+    public List<TranCarInfo> selectTranCarInfoNum(TranCarInfo tranCarInfo) {
+        //查合同下的发车数据
+        List<TranCarInfo> tranCarInfoList=this.selectList(new EntityWrapper<TranCarInfo>()
                 .eq("contract_no", tranCarInfo.getContractNo())
                 .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        return count;
+        return tranCarInfoList;
     }
 }

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

@@ -7,8 +7,6 @@ import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper;
@@ -25,9 +23,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import java.util.HashMap;
@@ -53,6 +49,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     private IWarehousePositionInfoService warehousePositionInfoService;
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
+    @Autowired
+    private ITranCarInfoService tranCarInfoService;
 
     /**
      * 待完成页面列表
@@ -299,6 +297,23 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             }
             // 编辑修改记录
             else {
+                //App端入库关联派车表
+                if("0".equals(warehouseInOutInfo.getPcFlag())){
+                    TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", warehouseInOutInfo.getContractNo())
+                        .eq("car_no",warehouseInOutInfo.getCarNo())
+                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0));
+                    if (tranCarInfo!=null){
+                        //将到货数据同步到派车表
+                        tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                        tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+                        tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
+                        tranCarInfo.setDeductionItems(warehouseInOutInfo.getDeductionItems());
+                        tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                        tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                        tranCarInfoService.updateById(tranCarInfo);
+                    }
+                }
                 warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
                 this.updateById(warehouseInOutInfo);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/DriverViewInfoMapper.xml

@@ -12,8 +12,7 @@
         left join driver_car_info c on d.id=c.driver_id
         left join driver_payee_info p on d.id=p.driver_id
         WHERE
-        d.comp_id = #{compId}
-        and d.delete_flag = '0'
+        d.delete_flag = '0'
         <if test="residentCityProvincial != null and residentCityProvincial != ''">
             AND d.resident_city_provincial = #{residentCityProvincial}
         </if>
@@ -26,6 +25,14 @@
             OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            <if test="pcFlag == 0">
+                AND common_id = #{commonId}
+            </if>
+            <if test="pcFlag == 1">
+                AND comp_id = #{compId}
+            </if>
+        </if>
         group by
         d.id
         ) t
@@ -48,8 +55,7 @@
         left join driver_car_info c on d.id=c.driver_id
         left join driver_payee_info p on d.id=p.driver_id
         WHERE
-        d.comp_id = #{compId}
-        and d.delete_flag = '0'
+        d.delete_flag = '0'
         <if test="residentCityProvincial != null and residentCityProvincial != ''">
             AND d.resident_city_provincial = #{residentCityProvincial}
         </if>
@@ -62,6 +68,14 @@
             OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            <if test="pcFlag == 0">
+                AND common_id = #{commonId}
+            </if>
+            <if test="pcFlag == 1">
+                AND comp_id = #{compId}
+            </if>
+        </if>
         group by
         d.id
         ORDER BY d.update_date DESC

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PurchaseOrderMapper.xml

@@ -43,6 +43,7 @@
         p.id,
         p.contract_no as contractNo,
         p.procurement_plan as procurementPlan,
+        p.goods_name as goodsName,
         p.customer,
         p.unit_price as unitPrice,
         p.basis,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -53,6 +53,7 @@
         d.mildew_grain as mildewGrain,
         d.imperfect_grain as imperfectGrain,
         d.quality_inspector as qualityInspector,
+        w.start_weight as startWeight,
         w.address_url as addressUrl
         FROM warehouse_in_out_info w
         left join warehouse_in_out_detail d on w.id=d.info_id