feat:远程交接

ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordDeliveryTaskBaseketController.java

@@ -87,7 +87,8 @@ public class RecordDeliveryTaskBaseketController extends BaseController
     @ResponseBody
     public AjaxResult addSave(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket)
     {
-        return toAjax(recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket));
+        // return toAjax(recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket));
+        return AjaxResult.success();
     }
 
     /**

ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordDeliveryTaskBaseket.java

@@ -19,7 +19,7 @@ public class RecordDeliveryTaskBaseket extends BaseEntity
 
     /** 自增主键 */
     private Long objid;
-
+    private String taskCode;
     /** 绑定时间 */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -30,6 +30,15 @@ public class RecordDeliveryTaskBaseket extends BaseEntity
     private Long basketId;
     private BaseBasketInfo baseBasketInfo;
 
+
+    public String getTaskCode() {
+        return taskCode;
+    }
+
+    public void setTaskCode(String taskCode) {
+        this.taskCode = taskCode;
+    }
+
     public BaseBasketInfo getBaseBasketInfo() {
         return baseBasketInfo;
     }

ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskBaseketMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.manager.mapper;
 
 import java.util.List;
 import com.ruoyi.manager.domain.RecordDeliveryTaskBaseket;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 交接资产Mapper接口
@@ -33,7 +34,7 @@ public interface RecordDeliveryTaskBaseketMapper
      * @param recordDeliveryTaskBaseket 交接资产
      * @return 结果
      */
-    public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket);
+    public int insertRecordDeliveryTaskBaseket(@Param("taskCode") String taskCode,@Param("ids") List<Long> ids);
 
     /**
      * 修改交接资产

ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordDeliveryTaskMapper.java

@@ -58,4 +58,6 @@ public interface RecordDeliveryTaskMapper
      * @return 结果
      */
     public int deleteRecordDeliveryTaskByDeliveryTaskIds(String[] deliveryTaskIds);
+
+    int countNowDateTaskNumber();
 }

ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskBaseketService.java

@@ -33,7 +33,7 @@ public interface IRecordDeliveryTaskBaseketService
      * @param recordDeliveryTaskBaseket 交接资产
      * @return 结果
      */
-    public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket);
+    // public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket);
 
     /**
      * 修改交接资产
@@ -58,4 +58,6 @@ public interface IRecordDeliveryTaskBaseketService
      * @return 结果
      */
     public int deleteRecordDeliveryTaskBaseketByObjid(Long objid);
+
+    public int  insertRecordDeliveryTaskBaseket(String taskCode, List<Long> ids);
 }

ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordDeliveryTaskService.java

@@ -58,4 +58,6 @@ public interface IRecordDeliveryTaskService
      * @return 结果
      */
     public int deleteRecordDeliveryTaskByDeliveryTaskId(Long deliveryTaskId);
+
+    int countNowDateTaskNumber();
 }

ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskBaseketServiceImpl.java

@@ -50,11 +50,11 @@ public class RecordDeliveryTaskBaseketServiceImpl implements IRecordDeliveryTask
      * @param recordDeliveryTaskBaseket 交接资产
      * @return 结果
      */
-    @Override
-    public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket)
-    {
-        return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket);
-    }
+    // @Override
+    // public int insertRecordDeliveryTaskBaseket(RecordDeliveryTaskBaseket recordDeliveryTaskBaseket)
+    // {
+    //     return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(recordDeliveryTaskBaseket);
+    // }
 
     /**
      * 修改交接资产
@@ -91,4 +91,9 @@ public class RecordDeliveryTaskBaseketServiceImpl implements IRecordDeliveryTask
     {
         return recordDeliveryTaskBaseketMapper.deleteRecordDeliveryTaskBaseketByObjid(objid);
     }
+
+    @Override
+    public int insertRecordDeliveryTaskBaseket(String taskCode, List<Long> ids) {
+        return recordDeliveryTaskBaseketMapper.insertRecordDeliveryTaskBaseket(taskCode, ids);
+    }
 }

ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordDeliveryTaskServiceImpl.java

@@ -94,4 +94,9 @@ public class RecordDeliveryTaskServiceImpl implements IRecordDeliveryTaskService
     {
         return recordDeliveryTaskMapper.deleteRecordDeliveryTaskByDeliveryTaskId(deliveryTaskId);
     }
+
+    @Override
+    public int countNowDateTaskNumber() {
+        return recordDeliveryTaskMapper.countNowDateTaskNumber();
+    }
 }

ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskBaseketMapper.xml

@@ -8,12 +8,13 @@
         <result property="objid" column="objid"/>
         <result property="crateTime" column="crate_time"/>
         <result property="basketId" column="basket_id"/>
+        <result property="taskCode" column="task_code"/>
         <association property="baseBasketInfo" javaType="com.ruoyi.manager.domain.BaseBasketInfo"
                      resultMap="com.ruoyi.manager.mapper.BaseBasketInfoMapper.BaseBasketInfoResult"/>
     </resultMap>
 
     <sql id="selectRecordDeliveryTaskBaseketVo">
-        select objid, crate_time, basket_id, basket_type, steel_grade, self_code
+        select objid, crate_time, basket_id, basket_type, steel_grade, self_code, task_code
         from record_delivery_task_baseket rb
                  left join base_basket_info bbi on bbi.obj_id = rb.basket_id
     </sql>
@@ -24,6 +25,7 @@
         <where>
             <if test="crateTime != null ">and crate_time = #{crateTime}</if>
             <if test="basketId != null ">and basket_id = #{basketId}</if>
+            <if test="taskCode != null ">and task_code = #{taskCode}</if>
         </where>
     </select>
 
@@ -33,17 +35,12 @@
         where objid = #{objid}
     </select>
 
-    <insert id="insertRecordDeliveryTaskBaseket" parameterType="RecordDeliveryTaskBaseket" useGeneratedKeys="true"
-            keyProperty="objid">
-        insert into record_delivery_task_baseket
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="crateTime != null">crate_time,</if>
-            <if test="basketId != null">basket_id,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="crateTime != null">#{crateTime},</if>
-            <if test="basketId != null">#{basketId},</if>
-        </trim>
+    <insert id="insertRecordDeliveryTaskBaseket"  >
+        insert into record_delivery_task_baseket(basket_id,task_code) values
+        <foreach collection="ids" item="item" separator="," >
+            (#{item},#{taskCode})
+        </foreach>
+
     </insert>
 
     <update id="updateRecordDeliveryTaskBaseket" parameterType="RecordDeliveryTaskBaseket">

ruoyi-manager/src/main/resources/mapper/manager/RecordDeliveryTaskMapper.xml

@@ -9,13 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskCode"    column="task_code"    />
         <result property="taskState"    column="task_state"    />
         <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="crate_time"    />
+        <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectRecordDeliveryTaskVo">
-        select delivery_task_id, task_code, task_state, create_by, crate_time, update_by, update_time from record_delivery_task
+        select delivery_task_id, task_code, task_state, create_by, create_time, update_by, update_time from record_delivery_task
     </sql>
 
     <select id="selectRecordDeliveryTaskList" parameterType="RecordDeliveryTask" resultMap="RecordDeliveryTaskResult">
@@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskCode != null">task_code,</if>
             <if test="taskState != null">task_state,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">crate_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
@@ -45,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskCode != null">#{taskCode},</if>
             <if test="taskState != null">#{taskState},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -57,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskCode != null">task_code = #{taskCode},</if>
             <if test="taskState != null">task_state = #{taskState},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">crate_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
@@ -75,4 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="countNowDateTaskNumber" resultType="int">
+        select count(*)
+        from record_delivery_task
+        where DATE (create_time) = CURDATE()
+
+    </select>
+
+
 </mapper>

ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.manager.domain.*;
 import com.ruoyi.manager.service.*;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -39,7 +39,8 @@ public class ApiController {
     private IRecordtRfidBindingService recordtRfidBindingService;
     @Autowired
     private ILedgerInstantBindingService ledgerInstantBindingService;//货物实时绑定信息
-
+    @Autowired
+    private IRecordCargoBindingService recordCargoBindingService;
 
     @PostMapping("/findBindingList")
     public AjaxResult findBindingList(String epc) {
@@ -80,6 +81,7 @@ public class ApiController {
         }
         return AjaxResult.error("库位没有维护");
     }
+
     // 接货查询
     @PostMapping("/jion/select")
     public AjaxResult jionSelect(String user) {
@@ -90,13 +92,43 @@ public class ApiController {
         if (list == null || list.isEmpty()) return AjaxResult.error("账号无绑定记录");
         return AjaxResult.success(list);
     }
+    @Autowired
+    private IRecordDeliveryTaskService recordDeliveryTaskService;
+    @Autowired
+    private IRecordDeliveryTaskBaseketService recordDeliveryTaskBaseketService;
+
     @PostMapping("/delivery/createTask")
-    public AjaxResult createDeliveryTask(String json, List<MultipartFile> files) {
+    public AjaxResult createDeliveryTask(String json,String user, List<MultipartFile> files) {
         List<Long> ids = JSONArray.parseArray(json, Long.class);
+        // 生成任务编码
+        int taskNumber = recordDeliveryTaskService.countNowDateTaskNumber();
+        String taskCode="Task"+DateUtils.dateTime()+String.format("%03d",taskNumber);
+        // 插入任务
+        RecordDeliveryTask recordDeliveryTask=new RecordDeliveryTask();
+        recordDeliveryTask.setTaskCode(taskCode);
+        recordDeliveryTask.setCreateBy(user);
+        recordDeliveryTaskService.insertRecordDeliveryTask(recordDeliveryTask);
+        // 插入资产到任务表
+        recordDeliveryTaskBaseketService.insertRecordDeliveryTaskBaseket(taskCode,ids);
+        // 插入图片
+        String filePath = RuoYiConfig.getUploadPath()+"/task";
+        for (int i = 0; i < files.size(); i++) {
+            try {
+                String fileName = FileUploadUtils.upload(filePath, files.get(i));
+                RecordDeliveryTaskImg recordDeliveryTaskImg=new RecordDeliveryTaskImg();
+                recordDeliveryTaskImg.setTaskCode(taskCode);
+                recordDeliveryTaskImg.setImgPath(fileName);
+                recordDeliveryTaskImgService.insertRecordDeliveryTaskImg(recordDeliveryTaskImg);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
 
         return AjaxResult.success();
     }
-
+    @Autowired
+    private IRecordDeliveryTaskImgService recordDeliveryTaskImgService;
     //交货提交
     @PostMapping("/join/jiaoSubmit")
     public AjaxResult joinJiaoSubmit(@RequestBody JoinSubmitBeen been) {
@@ -268,8 +300,7 @@ return AjaxResult.success();
         if (i > 0) return AjaxResult.success();
         return AjaxResult.error();
     }
-    @Autowired
-    private IRecordCargoBindingService recordCargoBindingService;
+
     // 货物绑定货框
     @PostMapping("/bindingSubmit")
     public AjaxResult bindingSubmit(@RequestBody BindingSubmitBeen submitBeen) {