计划货量修改

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscntrsMapper.java

@@ -89,4 +89,12 @@ public interface FtmsorderbillscntrsMapper {
      */
     public int updateTmsorderCntrStatusByOrgId(Ftmsorderbillscntrs ftmsorderbillscntrs);
 
+    /**
+     * 计划货量总和
+     * @param ftmsorderbillscntrs
+     * @return
+     */
+    public int selectftmsorderbillscntrs(Ftmsorderbillscntrs ftmsorderbillscntrs);
+
+
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsplansMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.orderPlan.mapper;
 
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
+import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillsplans;
 
 import java.util.List;
@@ -117,4 +118,11 @@ public interface FtmsorderbillsplansMapper {
      * @return  结果
      */
     List<Map<String, Object>> selectftmsorderbillsplansMapListForStowage(Ftmsorderbills ftmsorderbills);
+
+    /**
+     * 已调度的
+     * @param ftmsorderbillsplans
+     * @return
+     */
+    public int selectManagCout(Ftmsorderbillsplans ftmsorderbillsplans);
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsServiceImpl.java

@@ -78,6 +78,10 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         Map<String, Object> map = new HashMap<>();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
+//        ftmsorderbillscntrsMapper 计划货量总和
+        Ftmsorderbillscntrs ftmsorderbillscntrs = new Ftmsorderbillscntrs();
+//        F_TMSORDERBILLSPLANS 已调度
+        Ftmsorderbillsplans ftmsorderbillsplans = new Ftmsorderbillsplans();
         if ("22".equals(user.getUserType())) {
             ftmsorderbills.setIsFleet("1");
             TCorps corps = tCorpsMapper.selectTCorpsByFTel(user.getPhonenumber());
@@ -97,6 +101,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         FleetCarManage fleetCarManage = new FleetCarManage();
         fleetCarManage.setDelFlag("0");
         fleetCarManage.setBillStatus(6L);
+        //可用派车数量（总车辆-已派出的车辆）
         int carManageQuantity = fleetCarManageMapper.selectManageCount(ftmsorderbills);
         int carNumber = carManageQuantity - carQuantity;
         if (carNumber < 0) {
@@ -105,6 +110,19 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         map.put("upperLeftOldCarQuantity", carNumber);
         // 查询左下
         map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList(ftmsorderbills));
+        //新增柜数 就是 计划货量总和 F_TMSORDERBILLSCNTRS
+        //未安排柜数 = 计划货量总和 - 已调度货量(F_TMSORDERBILLSPLANS)
+        int scntrsManageQuantity = ftmsorderbillscntrsMapper.selectftmsorderbillscntrs(ftmsorderbillscntrs);
+        //已调度货量
+        int scnNumber = ftmsorderbillsplansMapper.selectManagCout(ftmsorderbillsplans);
+        //未安排柜数
+        int sanNumber = scntrsManageQuantity - scnNumber;
+        if (sanNumber < 0){
+            sanNumber = 0;
+        }
+        map.put("manageQuantity",scntrsManageQuantity);
+        map.put("scnNumber",scnNumber);
+        map.put("sanNumber",sanNumber);
         return AjaxResult.success(map);
     }
 

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

@@ -85,6 +85,11 @@
         where p_id = #{id}
     </select>
 
+    <select id="selectftmsorderbillscntrs" parameterType="ftmsorderbillscntrs" resultType="java.lang.Integer">
+        select cntr_qty from F_TMSORDERBILLSCNTRS
+        where between create_time = #{create_time}
+    </select>
+
     <insert id="insertftmsorderbillscntrs" parameterType="ftmsorderbillscntrs" useGeneratedKeys="true" keyProperty="id">
         insert into F_TMSORDERBILLSCNTRS
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -288,6 +288,11 @@
         where org_id = #{orgId}
     </select>
 
+    <select id="selectManagCout" parameterType="ftmsorderbillsplans" resultType="java.lang.Integer">
+        select cntr_qty from F_TMSORDERBILLSPLANS
+        where create_time = #{create_time}
+    </select>
+
     <insert id="insertftmsorderbillsplans" parameterType="ftmsorderbillsplans" useGeneratedKeys="true" keyProperty="id">
         insert into F_TMSORDERBILLSPLANS
         <trim prefix="(" suffix=")" suffixOverrides=",">