Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -351,7 +351,12 @@ public class KHTWarehousebillsController extends BaseController
     public AjaxResult importCreateCompanyMsgNew(@RequestParam("file") MultipartFile file)throws Exception
     {
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehousebillsService.importCreateCompanyMsgNew(file,loginUser);
+        try {
+            AjaxResult ajaxResult = tWarehousebillsService.importCreateCompanyMsgNew(file, loginUser);
+            return ajaxResult;
+        }catch (Exception e){
+            return AjaxResult.error("导入失败");
+        }
     }
     /**
      * 下载箱信息导入模板

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHUpdateOrderMessage.java

@@ -81,6 +81,20 @@ public class KHUpdateOrderMessage {
         return tWarehousebillsService.exportInventory(tWarehouseBills);
     }
 
+    /**
+     * 凯和若依端删除订单
+     * @param tWarehouseBills
+     * @return
+     */
+    @GetMapping("/deleteOrder")
+    public AjaxResult deleteOrder(TWarehouseBills tWarehouseBills){
+        if (tWarehouseBills.getfId() == null){
+            return AjaxResult.error("请选择要删除的订单");
+        }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tWarehousebillsService.deleteOrder(tWarehouseBills,loginUser);
+    }
+
 }
 
 

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/mapper/AuditItemsMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.approvalFlow.mapper;
 import com.ruoyi.approvalFlow.domain.AuditItems;
 import com.ruoyi.approvalFlow.domain.AuditPaths;
 import com.ruoyi.approvalFlow.domain.AuditPathsLevels;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -57,6 +58,13 @@ public interface AuditItemsMapper {
     public int deleteAuditItemsById(Long id);
 
     /**
+     * 凯和若依端删除订单并把审批流删除
+     * @param id
+     * @return
+     */
+    public int deleteAuditItemsByBillId(@Param("id") Long id);
+
+    /**
      * 批量删除审批流任务明细
      *
      * @param ids 需要删除的数据ID

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -520,4 +520,12 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult exportInventory(TWarehouseBills tWarehouseBills);
+
+    /**
+     * 凯和若依端删除订单
+     * @param tWarehouseBills
+     * @param loginUser
+     * @return
+     */
+    public AjaxResult deleteOrder(TWarehouseBills tWarehouseBills,LoginUser loginUser);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1861,6 +1861,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 companyMsg.setCreateTime(new Date());
                 for (int a = 0; a < rows.getPhysicalNumberOfCells(); a++) {
                     Cell cell = rows.getCell(a);
+                    if (cell == null){
+                        continue;
+                    }
                     String value = filter(sheet.getRow(0), CellReference.convertNumToColString(cell.getColumnIndex()));
                     switch (value) {
                         case "箱号":
@@ -1931,7 +1934,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             break;
                     }
                 }
-                tTemporaryFileMapper.insertTTemporaryFile(companyMsg);
+                if (StringUtils.isNotEmpty(companyMsg.getfCntrno())){
+                    tTemporaryFileMapper.insertTTemporaryFile(companyMsg);
+                }
                 fleetCompanyMsgs.add(companyMsg);
             }
             map.put("total",fleetCompanyMsgs.size());
@@ -5162,6 +5167,27 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
     }
 
+    @Override
+    public AjaxResult deleteOrder(TWarehouseBills tWarehouseBills, LoginUser loginUser) {
+        TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(tWarehouseBills.getfId());
+        if (warehouseBills == null){
+            return AjaxResult.error("未找到订单信息,请确认");
+        }
+        //修改订单状态
+        TWarehouseBills bills = new TWarehouseBills();
+        bills.setfId(tWarehouseBills.getfId());
+        bills.setDelFlag("1");
+        bills.setUpdateBy(loginUser.getUser().getUserName());
+        bills.setUpdateTime(new Date());
+        int i = tWarehouseBillsMapper.updateKaHeOrder(bills);
+        if (i <= 0){
+            return AjaxResult.error("删除订单失败");
+        }
+        //删除审批流
+        int billId = auditItemsMapper.deleteAuditItemsByBillId(tWarehouseBills.getfId());
+        return AjaxResult.success();
+    }
+
     private String getAbsoluteFile(String fileName) {
         String downloadPath = RuoYiConfig.getDownloadPath() + fileName;
         File desc = new File(downloadPath);

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -314,6 +314,16 @@
         AND item.bill_id = #{id}
         AND item.fid_status = #{fidStatus}
     </delete>
+    <delete id="deleteAuditItemsByBillId" parameterType="Long">
+        DELETE
+	        ai.*,
+            au.*
+        FROM
+            audit_items ai
+        LEFT JOIN audit_items_users au
+        ON ai.id = au.pid
+        WHERE ai.bill_id = #{id}
+    </delete>
 
     <update id="updateAuditStatus" parameterType="com.ruoyi.approvalFlow.domain.AuditItems">
         UPDATE audit_items it