修改

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

@@ -163,6 +163,16 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      * 状态英文
      */
     private String statusEn;
+    /**
+     * 合同编号
+     */
+    @TableField(exist = false)
+    private String contractNo;
+    /**
+     * 货名
+     */
+    @TableField(exist = false)
+    private String goodsName;
 
 
     @TableField(exist = false)

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

@@ -146,6 +146,18 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      * 车牌号
      */
     private String carNo;
+    /**
+     * 派车编号
+     */
+    private String tranCarNo;
+    /**
+     * 用户id
+     */
+    private String commonId;
+    /**
+     * 发车净重（吨）
+     */
+    private Float startWeight;
     /**
      * 出库合同编号
      */
@@ -235,6 +247,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     @TableField(exist = false)
     private String jiaorenli;
+    /**
+     * PC端(传1)
+     */
+    @TableField(exist = false)
+    private String pcFlag;
 
     @Override
     protected Serializable pkVal() {

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

@@ -10,11 +10,13 @@ import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranCarInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +38,8 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private IDriverViewInfoService driverViewInfoService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
 
     /**
      * 添加发车信息
@@ -48,6 +52,7 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
         tranCarInfo.setId(IdGenerator.generateUUID());
         tranCarInfo.setStatus(StatusEnum.TRAN_DO.getName());
         tranCarInfo.setStatusFlag(StatusEnum.TRAN_DO.getFlag());
+        tranCarInfo.setConfirmFlag(StatusEnum.NOT_CONFIRM.getFlag());
         //根据手机号判断司机是否认证
         DriverViewInfo driverViewInfo =
                 driverViewInfoService.selectOne(new EntityWrapper<DriverViewInfo>()
@@ -56,6 +61,18 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
         if (driverViewInfo==null) {
             throw new AppServiceException(ExceptionDefinition.DRIVER_NOT_CERTIFIED);
         }
+        //发车时生成入库任务
+        WarehouseInOutInfo warehouseInOutInfo=new WarehouseInOutInfo();
+        warehouseInOutInfo.setId(IdGenerator.generateUUID());
+        warehouseInOutInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+        warehouseInOutInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+        warehouseInOutInfo.setTranCarNo(tranCarInfo.getTranCarNo());
+        warehouseInOutInfo.setCarNo(tranCarInfo.getCarNo());
+        warehouseInOutInfo.setTaskType("入库任务");
+        warehouseInOutInfo.setContractNo(tranCarInfo.getContractNo());
+        warehouseInOutInfo.setGoodsName(tranCarInfo.getGoodsName());
+        warehouseInOutInfo.setStartWeight(tranCarInfo.getLoadNetWeight());
+        boolean two = warehouseInOutInfoService.insert(warehouseInOutInfo);
         boolean one = this.insert(tranCarInfo);
         // 插入操作历史
         String staffName = this.billOperateHisService.getStaffAndName();
@@ -63,7 +80,7 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
         this.billOperateHisService.saveBillOperateHis(tranCarInfo.getId(), NumberConstant.CONSTANT_TRAN, staffName, null,
                 tranCarInfo.getStatus(), null, "");
         //成功返回ok
-        if (one) {
+        if (one&&two) {
             return "OK";
         } else {
             return "NG";

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

@@ -323,6 +323,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("baseId", warehouseInOutInfo.getBaseId());
         //  仓位ID
         pageView.put("positionId", warehouseInOutInfo.getPositionId());
+        pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());
         pageView.put("pageSize", warehouseInOutInfo.getPageSize());
         pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());

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

@@ -8,9 +8,7 @@
         FROM warehouse_in_out_info w
         left join warehouse_in_out_detail d on w.id=d.info_id
         WHERE
-        w.base_id = #{baseId}
-        and w.position_id = #{positionId}
-        and w.delete_flag = '0'
+        w.delete_flag = '0'
         and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
@@ -20,6 +18,10 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            AND w.base_id = #{baseId}
+            and w.position_id = #{positionId}
+        </if>
     </select>
     <!-- 流转记录列表查询 -->
     <select id="getListByCondition" parameterType="Map"
@@ -49,9 +51,7 @@
         FROM warehouse_in_out_info w
         left join warehouse_in_out_detail d on w.id=d.info_id
         WHERE
-        w.base_id = #{baseId}
-        and w.position_id = #{positionId}
-        and w.delete_flag = '0'
+        w.delete_flag = '0'
         and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
@@ -61,6 +61,10 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
+        <if test="pcFlag != null and pcFlag != ''">
+            AND w.base_id = #{baseId}
+            and w.position_id = #{positionId}
+        </if>
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}