解决禅道问题,修改基础资料查询条件，完善 仓库完善接口，添加商品新加字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -60,8 +60,7 @@ public class FleetCompanyMsgController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TCorps tCorps)
     {
-        String typeValue = "[\"4\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("100");
         List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);
     }
@@ -73,8 +72,7 @@ public class FleetCompanyMsgController extends BaseController
     @GetMapping("/query")
     public TableDataInfo query(TCorps tCorps)
     {
-        String typeValue = "[\"4\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("100");
         startPage();
         List<TCorps> list = tCorpsService.selectTCorpsList(tCorps);
         return getDataTable(list);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -52,8 +52,7 @@ public class FleetDriverMsgController extends BaseController
     @GetMapping("/list")
     public List<TCorps> list(TCorps tCorps)
     {
-        String typeValue = "[\"6\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("102");
         return tCorpsService.selectTCorpsList(tCorps);
     }
 
@@ -64,8 +63,7 @@ public class FleetDriverMsgController extends BaseController
     @GetMapping(value = "/query")
     public TableDataInfo query(TCorps tCorps)
     {
-        String typeValue = "[\"6\"]";
-        tCorps.setfTypeid(typeValue);
+        tCorps.setfTypeid("102");
         startPage();
         List<Map<String, Object>> list = tCorpsService.selectFleetDriverMsgListMap(tCorps);
         return getDataTable(list);

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -101,9 +101,10 @@ public class FleetCompanyMsgServiceImpl implements IFleetCompanyMsgService {
     @Override
     @Transactional
     public AjaxResult insertFleetCompanyMsg(TCorps tCorps) {
-        String typeValue = "[\"4\"]";
+        String typeValue = "[\"100\"]";
         tCorps.setfTypeid(typeValue);
-        tCorps.setfStatus("1");
+        tCorps.setfTypename("车队");
+        tCorps.setfStatus("0");
         if (StringUtils.isNotNull(tCorps.getfId())) {
             tCorps.setUpdateBy(SecurityUtils.getUsername());
             tCorps.setUpdateTime(new Date());

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -100,9 +100,10 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
-        String typeValue = "[\"6\"]";
+        String typeValue = "[\"102\"]";
         tCorps.setfTypeid(typeValue);
-        tCorps.setfStatus("1");
+        tCorps.setfTypename("司机");
+        tCorps.setfStatus("0");
         if (null != tCorps.getfId()) {
             updateDriverPhone(tCorps);
             tCorps.setUpdateTime(new Date());

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -529,8 +529,7 @@
             <if test="carStatus != null and carStatus == 'mdLoadDate'">and c.md_load_date IS NULL</if>
             <if test="carStatus != null and carStatus == 'unLoadDate'">and c.un_load_date IS NULL</if>
             <if test="carStatus != null and carStatus == 'waybillDate'">and c.waybill_date IS NULL</if>
-            <if test="isFleet != null and isFleet == '1'">
-                AND fleet.f_typeid = '["4"]'
+            <if test="isFleet != null and isFleet == 1">
                 AND fleet.f_id = #{fleetId}
             </if>
             <if test='planDate != null and planDate[0] != null and planDate[0]!= ""'>

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TGoods.java

@@ -74,6 +74,18 @@ public class TGoods extends BaseEntity {
     @Excel(name = "包装类型，存储id 显示名称 下拉选择类型，一个商品名称对应一个包装类型，对应t_package的f_id")
     private Long fPackageid;
 
+    /** 是否按箱号统计 */
+    @Excel(name = "是否按箱号统计")
+    private String ifCntrno;
+
+    public String getIfCntrno() {
+        return ifCntrno;
+    }
+
+    public void setIfCntrno(String ifCntrno) {
+        this.ifCntrno = ifCntrno;
+    }
+
     /**
      * 状态
      */
@@ -184,24 +196,20 @@ public class TGoods extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("fId", getfId())
-                .append("fTypeid", getfTypeid())
-                .append("fNo", getfNo())
-                .append("fName", getfName())
-                .append("fEnam", getfEnam())
-                .append("fSpecs", getfSpecs())
-                .append("fPackagespecs", getfPackagespecs())
-                .append("fColor", getfColor())
-                .append("fHscode", getfHscode())
-                .append("fPackageid", getfPackageid())
-                .append("fStatus", getfStatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
+        return "TGoods{" +
+                "fId=" + fId +
+                ", fTypeid=" + fTypeid +
+                ", fNo='" + fNo + '\'' +
+                ", fName='" + fName + '\'' +
+                ", fEnam='" + fEnam + '\'' +
+                ", fSpecs='" + fSpecs + '\'' +
+                ", fPackagespecs='" + fPackagespecs + '\'' +
+                ", fColor='" + fColor + '\'' +
+                ", fHscode='" + fHscode + '\'' +
+                ", fPackageid=" + fPackageid +
+                ", ifCntrno='" + ifCntrno + '\'' +
+                ", fStatus='" + fStatus + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -70,6 +70,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
      */
     @Override
     public List<TCorps> selectTCorpsList(TCorps tCorps) {
+        if (StringUtils.isNotEmpty(tCorps.getfTypeid())) {
+            tCorps.setfTypeid("\""+tCorps.getfTypeid()+"\"");
+        }
         return tCorpsMapper.selectTCorpsList(tCorps);
     }
 

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

@@ -316,6 +316,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         } else {
             tWhgenleg.setfMblno(warehouseBills.getfMblno());
         }
+        // 箱号
+        if (StringUtils.isNotEmpty(warehousebillsitems.getfBoxno())) {
+            tWhgenleg.setfCntrno(warehousebillsitems.getfBoxno());
+        }
         // 库区
         tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid());
         // 货物品名

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -70,7 +70,8 @@
     <select id="selectTCorpsList" parameterType="TCorps" resultMap="TCorpsResult">
         <include refid="selectTCorpsVo"/>
         <where>
-            <if test="fTypeid != null  and fTypeid != ''"> and f_typeid like concat('%', #{fTypeid}, '%')</if>
+            <if test="fTypeid != null  and fTypeid != ''"> and JSON_CONTAINS( f_typeid -> '$[*]', #{fTypeid}, '$')</if>
+            <if test="fTypeid == null or fTypeid == ''"> and f_typeid != '[\"102\"]'</if>
             <if test="fPid != null  and fPid != ''"> and f_pid = #{fPid}</if>
             <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if>
             <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
@@ -173,7 +174,7 @@
         </where>
     </select>
 
-    <select id="selectTCorpsByFTel" resultType="string" parameterType="TCorps">
+    <select id="selectTCorpsByFTel" parameterType="String" resultMap="TCorpsResult">
         select f_id, f_pid, f_typeid, f_no, f_name from t_corps where f_tel = #{phonenumber}
     </select>
 

ruoyi-warehouse/src/main/resources/mapper/basicData/TGoodsMapper.xml

@@ -5,33 +5,35 @@
 <mapper namespace="com.ruoyi.basicData.mapper.TGoodsMapper">
 
     <resultMap type="TGoods" id="TGoodsResult">
-        <result property="fId" column="f_id"/>
-        <result property="fTypeid" column="f_typeid"/>
-        <result property="fNo" column="f_no"/>
-        <result property="fName" column="f_name"/>
-        <result property="fEnam" column="f_enam"/>
-        <result property="fSpecs" column="f_specs"/>
-        <result property="fPackagespecs" column="f_packagespecs"/>
-        <result property="fColor" column="f_color"/>
-        <result property="fHscode" column="f_hscode"/>
-        <result property="fPackageid" column="f_packageid"/>
-        <result property="fStatus" column="f_status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
+        <result property="fId"    column="f_id"    />
+        <result property="fTypeid"    column="f_typeid"    />
+        <result property="fNo"    column="f_no"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fEnam"    column="f_enam"    />
+        <result property="fSpecs"    column="f_specs"    />
+        <result property="fPackagespecs"    column="f_packagespecs"    />
+        <result property="fColor"    column="f_color"    />
+        <result property="fHscode"    column="f_hscode"    />
+        <result property="fPackageid"    column="f_packageid"    />
+        <result property="ifCntrno"    column="if_cntrno"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectTGoodsVo">
-        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
+        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, if_cntrno, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
     </sql>
 
     <select id="selectTGoodsList" parameterType="TGoods" resultMap="TGoodsResult">
         <include refid="selectTGoodsVo"/>
         <where>
             <if test="fTypeid != null  and fTypeid != ''">and f_typeid = #{fTypeid}</if>
+            <if test="ifCntrno != null  and ifCntrno != ''">and if_cntrno = #{ifCntrno}</if>
             <if test="fNo != null  and fNo != ''">and f_no like concat('%', #{fNo}, '%')</if>
             <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if>
             <if test="fEnam != null  and fEnam != ''">and f_enam like concat('%', #{fEnam}, '%')</if>
@@ -52,15 +54,16 @@
     <insert id="insertTGoods" parameterType="TGoods" useGeneratedKeys="true" keyProperty="fId">
         insert into t_goods
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">f_typeid,</if>
+            <if test="fTypeid != null">f_typeid,</if>
             <if test="fNo != null and fNo != ''">f_no,</if>
             <if test="fName != null and fName != ''">f_name,</if>
-            <if test="fEnam != null">f_enam,</if>
-            <if test="fSpecs != null">f_specs,</if>
+            <if test="fEnam != null and fEnam != ''">f_enam,</if>
+            <if test="fSpecs != null and fSpecs != ''">f_specs,</if>
             <if test="fPackagespecs != null">f_packagespecs,</if>
             <if test="fColor != null">f_color,</if>
             <if test="fHscode != null">f_hscode,</if>
             <if test="fPackageid != null">f_packageid,</if>
+            <if test="ifCntrno != null">if_cntrno,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -70,15 +73,16 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">#{fTypeid},</if>
+            <if test="fTypeid != null">#{fTypeid},</if>
             <if test="fNo != null and fNo != ''">#{fNo},</if>
             <if test="fName != null and fName != ''">#{fName},</if>
-            <if test="fEnam != null">#{fEnam},</if>
-            <if test="fSpecs != null">#{fSpecs},</if>
+            <if test="fEnam != null and fEnam != ''">#{fEnam},</if>
+            <if test="fSpecs != null and fSpecs != ''">#{fSpecs},</if>
             <if test="fPackagespecs != null">#{fPackagespecs},</if>
             <if test="fColor != null">#{fColor},</if>
             <if test="fHscode != null">#{fHscode},</if>
             <if test="fPackageid != null">#{fPackageid},</if>
+            <if test="ifCntrno != null">#{ifCntrno},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -92,15 +96,16 @@
     <update id="updateTGoods" parameterType="TGoods">
         update t_goods
         <trim prefix="SET" suffixOverrides=",">
-            <if test="fTypeid != null and fTypeid != ''">f_typeid = #{fTypeid},</if>
+            <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
             <if test="fNo != null and fNo != ''">f_no = #{fNo},</if>
             <if test="fName != null and fName != ''">f_name = #{fName},</if>
-            <if test="fEnam != null">f_enam = #{fEnam},</if>
-            <if test="fSpecs != null">f_specs = #{fSpecs},</if>
+            <if test="fEnam != null and fEnam != ''">f_enam = #{fEnam},</if>
+            <if test="fSpecs != null and fSpecs != ''">f_specs = #{fSpecs},</if>
             <if test="fPackagespecs != null">f_packagespecs = #{fPackagespecs},</if>
             <if test="fColor != null">f_color = #{fColor},</if>
             <if test="fHscode != null">f_hscode = #{fHscode},</if>
             <if test="fPackageid != null">f_packageid = #{fPackageid},</if>
+            <if test="ifCntrno != null">if_cntrno = #{ifCntrno},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -180,6 +180,7 @@
         <where>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and f_mblno = #{fMblno}</if>
+            <if test="fCntrno != null ">and f_cntrno = #{fCntrno}</if>
             <if test="fWarehouseLocationid != null ">and f_warehouse_locationid = #{fWarehouseLocationid}</if>
             <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
             <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>