凯和修改

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

@@ -69,9 +69,9 @@ public class TCntrnoController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TCntrno tCntrno)
     {
-        List<TCntrno> list = tCntrnoService.selectTCntrnoList(tCntrno);
+        List<TCntrno> list = tCntrnoService.selectTcntrnoMessage(tCntrno);
         ExcelUtil<TCntrno> util = new ExcelUtil<TCntrno>(TCntrno.class);
-        return util.exportExcel(list, "cntrno");
+        return util.exportExcel(list, "箱信息");
     }
 
     /**
@@ -239,6 +239,19 @@ public class TCntrnoController extends BaseController
         }
     }
 
+    /**
+     * 商务端获取集装箱 箱号、地点、空重
+     * @param tCntrno
+     * @return
+     */
+    @GetMapping("/getTcntrnoFno")
+    public TableDataInfo getTcntrnoFno(TCntrno tCntrno)
+    {
+        startPage();
+        List<Map<String, Object>> list = tCntrnoService.getTcntrnoFno(tCntrno);
+        return getDataTable(list);
+    }
+
 
 
 

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TCntrno.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.With;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -29,64 +30,87 @@ public class TCntrno extends BaseEntity
     @Excel(name = "箱号")
     private String fNo;
 
+    //箱类型中文
+    @Excel(name = "箱类型")
+    private String typeidName;
+
+    //地点中文名称
+    @Excel(name = "地点")
+    private String addressName;
+
+    //箱主中文
+    @Excel(name = "箱主")
+    private String ownerName;
+
+    //箱来源中文
+    @Excel(name = "箱来源")
+    private String sourceName;
+
+    //箱状态中文
+    @Excel(name = "箱状态")
+    private String cntrstatusName;
+
+    //租赁方式中文
+    @Excel(name = "租赁方式")
+    private String rentName;
+
+    //空重中文
+    @Excel(name = "空重")
+    private String updateEFName;
+
+    /*备注*/
+    @Excel(name = "备注")
+    private String remark;
+
+    /*创建者*/
+    @Excel(name = "录入人")
+    private String createBy;
+
+    /* 创建时间*/
+    @Excel(name = "录入时间",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /* 更新者*/
+    @Excel(name = "最新修改人")
+    private String updateBy;
+
+    /* 更新时间*/
+    @Excel(name = "最新修改时间",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+
     /** 箱类型（存t_cntr 编号 存储id） */
-    @Excel(name = "箱类型", readConverterExp = "存=t_cntr,编=号,存=储id")
     private Long fTypeid;
 
     /** 箱主（选择数据字典 铁路凯和） */
-    @Excel(name = "箱主", readConverterExp = "选=择数据字典,铁=路凯和")
     private String fOwner;
 
     /** 箱来源（数据字典 自由，租赁、买入、合作） */
-    @Excel(name = "箱来源", readConverterExp = "数=据字典,自=由，租赁、买入、合作")
     private String fSource;
 
     /** 租赁方式（数据字典 长租、短租） */
-    @Excel(name = "租赁方式", readConverterExp = "数=据字典,长=租、短租")
     private String fRent;
 
     /** 最新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "最新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fUpdatetime;
 
     /** 最新地点 */
-    @Excel(name = "最新地点")
     private String fUpdateaddress;
-
     /** 数据字典  空重 */
-    @Excel(name = "数据字典  空重")
     private String fUpdateef;
-
     /** 数据字典 好 坏 */
-    @Excel(name = "数据字典 好 坏")
     private String fCntrstatus;
-
     /** 默认 T ,正常T 停用F 下拉选择 */
-    @Excel(name = "默认 T ,正常T 停用F 下拉选择")
     private String fStatus;
     /**数据字典 调箱动作*/
-    @Excel(name = "数据字典 调箱动作")
     private String fOpctnstatus;
-    @Excel(name = "铅封号")
     private String fSealno;
-
     //提单号
     private String fMblno;
-    //箱主中文
-    private String ownerName;
-    //箱类型中文
-    private String typeidName;
-    //箱来源中文
-    private String sourceName;
-    //租赁方式中文
-    private String rentName;
-    //空重中文
-    private String updateEFName;
-    //地点中文名称
-    private String addressName;
-    //箱状态中文
-    private String cntrstatusName;
     //查询时间区间
     private List<String> cLoadDate;
     //集装箱尺码

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TCntrnoMapper.java

@@ -105,4 +105,11 @@ public interface TCntrnoMapper
      * @return 结果
      */
     public int insertTCntrnoList(List<TCntrno> tCntrno);
+
+    /**
+     * 获取 箱号、地点、空重
+     * @param tCntrno
+     * @return
+     */
+    public List<Map<String, Object>> getTcntrnoFno(TCntrno tCntrno);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITCntrnoService.java

@@ -136,4 +136,11 @@ public interface ITCntrnoService
      * @return
      */
     public AjaxResult batch(String tCntrno, LoginUser loginUser);
+
+    /**
+     * 获取 箱号、地点、空重
+     * @param tCntrno
+     * @return
+     */
+    public List<Map<String, Object>> getTcntrnoFno(TCntrno tCntrno);
 }

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -489,6 +489,11 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> getTcntrnoFno(TCntrno tCntrno) {
+        return tCntrnoMapper.getTcntrnoFno(tCntrno);
+    }
+
     /**
      * set字段
      *

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -429,6 +429,24 @@
             </trim>
         </foreach>
     </insert>
+    <select id="getTcntrnoFno" parameterType="TCntrno" resultType="map">
+        SELECT
+        tc.f_no,
+        address.f_name addressName,
+        sdda.dict_label updateEFName
+        FROM
+        t_cntrno tc
+        LEFT JOIN sys_dict_data sdda ON sdda.dict_value = tc.f_updateEF
+        AND sdda.dict_type = 'f_updateEF'
+        LEFT JOIN t_address address ON address.f_id = tc.f_updateaddress
+        <where>
+            tc.f_status = 'T'
+            <if test="fNo != null  and fNo != ''">and tc.f_no like concat('%', #{fNo}, '%') </if>
+            <if test="fUpdateaddress != null  and fUpdateaddress != ''">and tc.f_updateaddress = #{fUpdateaddress}</if>
+            <if test="fUpdateef != null  and fUpdateef != ''">and tc.f_updateEF = #{fUpdateef}</if>
+        </where>
+        ORDER BY tc.f_no
+    </select>
 
 
 </mapper>

ruoyi-warehouse/src/main/java/com/ruoyi/appVersion/service/impl/TAppVersionServiceImpl.java

@@ -130,11 +130,13 @@ public class TAppVersionServiceImpl implements ITAppVersionService
             map.put("version",VersionUtil.getDictCache("android_version"));
             map.put("url",VersionUtil.getDictCache("android_url"));
             map.put("plus_msg",VersionUtil.getDictCache("android_plus_msg"));
+            map.put("minimum_Version",VersionUtil.getDictCache("android_minimum_Version"));
             return AjaxResult.success("success",map);
         }else if (integer == 2){ //2 ios
             map.put("version",VersionUtil.getDictCache("ios_version"));
             map.put("url",VersionUtil.getDictCache("ios_url"));
             map.put("plus_msg",VersionUtil.getDictCache("ios_plus_msg"));
+            map.put("minimum_Version",VersionUtil.getDictCache("ios_minimum_Version"));
             return AjaxResult.success("success",map);
         }
         return AjaxResult.success();

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -946,7 +946,7 @@ public class TFeeServiceImpl implements ITFeeService {
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(tFee.getfBillno()); // 业务编号
             auditItems.setRefno1(String.valueOf(tFee.getfCorpid())); // 货权方
-            auditItems.setRefno2(tFee.getfBilltype());// 财务类型
+            auditItems.setRefno2(fBilltype);// 财务类型
             auditItems.setRefno3(tFee.gettMblno());// 提单号
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(loginUser.getUsername());

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

@@ -755,6 +755,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         String key = "";//键
         long actId = 0L;//活动id
         Long fPid = null;
+        Long billStatus = null;
         Map<String, Object> map = new HashMap<>();
         if ("KHDD".equals(billsType)) {
             actId = 410L;
@@ -768,6 +769,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if ("0".equals(sysConfig.getConfigValue())) {
             isApprove = true;
         }
+        if (isApprove) {
+            billStatus = 4L;
+        } else {
+            billStatus = 6L;
+        }
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
         JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntr);
         List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntr.class);
@@ -785,11 +791,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehouseBills.setfCorpid(clientFid);
             warehouseBills.setfContacts(loginUser.getUser().getUserName());
             warehouseBills.setfTel(loginUser.getUser().getPhonenumber());
-            if (isApprove) {
-                warehouseBills.setfBillstatus(4L);
-            } else {
-                warehouseBills.setfBillstatus(6L);
-            }
+            warehouseBills.setfBillstatus(billStatus);
+            warehouseBills.setfTimes(1L);
             int i = tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
             if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
                 for (TWarehousebillsCntr warehousebillsCntr : tWarehousebillsCntrs) {
@@ -811,11 +814,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fPid = warehouseBills.getfId();
             warehouseBills.setUpdateTime(DateUtils.getNowDate());
             warehouseBills.setUpdateBy(SecurityUtils.getUsername());
-            if (isApprove) {
-                warehouseBills.setfBillstatus(4L);
-            } else {
-                warehouseBills.setfBillstatus(6L);
-            }
+            warehouseBills.setfBillstatus(billStatus);
+            warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
             tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(warehouseBills.getfId());
             if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
@@ -852,6 +852,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
+            auditItems.setFidStatus("f_billstatus");
+            auditItems.setTimes(1L);
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
 //            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
             String code = approvalFlow.get("code").toString();
@@ -954,6 +956,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("当前数据不允许提交");
         }
+        warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
         tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
         if (CollectionUtils.isNotEmpty(tWarehousebillsCntritemsList)) {
@@ -989,6 +992,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
+            auditItems.setFidStatus("f_billstatus");
+            auditItems.setTimes(1L);
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
 //            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
             String code = approvalFlow.get("code").toString();
@@ -2271,6 +2276,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (tWarehouseBills.getfBillstatus() != 11L) {
             return AjaxResult.error("订单未审核完成，暂不支持维护提单号");
         }
+        warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
         /*TWarehouseBills bills = new TWarehouseBills();
         bills.setfId(warehouseBills.getfId());
         bills.setfMblno(warehouseBills.getfMblno());*/
@@ -2368,6 +2374,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setAuditOpTime(new Date());
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");
+            auditItems.setFidStatus("f_billstatus");
+            auditItems.setTimes(1L);
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
 //            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
             String code = approvalFlow.get("code").toString();