计划货量总和报错修改

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

@@ -91,10 +91,9 @@ public interface FtmsorderbillscntrsMapper {
 
     /**
      * 计划货量总和
-     * @param ftmsorderbillscntrs
      * @return
      */
-    public int selectftmsorderbillscntrs(Ftmsorderbillscntrs ftmsorderbillscntrs);
+    public Integer selectftmsorderbillscntrs();
 
 
 }

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

@@ -121,8 +121,7 @@ public interface FtmsorderbillsplansMapper {
 
     /**
      * 已调度的
-     * @param ftmsorderbillsplans
      * @return
      */
-    public int selectManagCout(Ftmsorderbillsplans ftmsorderbillsplans);
+    public Integer selectManagCout();
 }

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

@@ -79,9 +79,9 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Ftmsorderbills ftmsorderbills = new Ftmsorderbills();
 //        ftmsorderbillscntrsMapper 计划货量总和
-        Ftmsorderbillscntrs ftmsorderbillscntrs = new Ftmsorderbillscntrs();
+//        Ftmsorderbillscntrs ftmsorderbillscntrs = new Ftmsorderbillscntrs();
 //        F_TMSORDERBILLSPLANS 已调度
-        Ftmsorderbillsplans ftmsorderbillsplans = new Ftmsorderbillsplans();
+//        Ftmsorderbillsplans ftmsorderbillsplans = new Ftmsorderbillsplans();
         if ("22".equals(user.getUserType())) {
             ftmsorderbills.setIsFleet("1");
             TCorps corps = tCorpsMapper.selectTCorpsByFTel(user.getPhonenumber());
@@ -110,19 +110,22 @@ 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;
+//        //新增柜数 就是 计划货量总和 F_TMSORDERBILLSCNTRS
+//        //未安排柜数 = 计划货量总和 - 已调度货量(F_TMSORDERBILLSPLANS)
+        Integer scntrsManageQuantity = ftmsorderbillscntrsMapper.selectftmsorderbillscntrs();
+        if (scntrsManageQuantity == null || scntrsManageQuantity <= 0){
+            return AjaxResult.error("今日没有新增柜数");
+        }
+//        //已调度货量
+        Integer scnNumber = ftmsorderbillsplansMapper.selectManagCout();
+//        //未安排柜数 --自动拆箱
+        int sanNoNumber = scntrsManageQuantity - scnNumber;
+        if (sanNoNumber < 0){
+            sanNoNumber = 0;
         }
         map.put("manageQuantity",scntrsManageQuantity);
         map.put("scnNumber",scnNumber);
-        map.put("sanNumber",sanNumber);
+        map.put("sanNuNomber",sanNoNumber);
         return AjaxResult.success(map);
     }
 

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

@@ -85,9 +85,9 @@
         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 id="selectftmsorderbillscntrs" resultType="java.lang.Integer">
+        select IFNULL(cntr_qty,null) manageQuantity from F_TMSORDERBILLSCNTRS
+        where to_days(create_time) = to_days(now())
     </select>
 
     <insert id="insertftmsorderbillscntrs" parameterType="ftmsorderbillscntrs" useGeneratedKeys="true" keyProperty="id">

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

@@ -288,9 +288,9 @@
         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 id="selectManagCout" resultType="java.lang.Integer">
+        select IFNULL(cntr_qty,null) scnNumber from F_TMSORDERBILLSPLANS
+        where to_days(create_time) = to_days(now())
     </select>
 
     <insert id="insertftmsorderbillsplans" parameterType="ftmsorderbillsplans" useGeneratedKeys="true" keyProperty="id">