Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseFpPlanqtyController.java

@@ -87,13 +87,7 @@ public class BaseFpPlanqtyController extends BaseController
     public AjaxResult addSave(BaseFpPlanqty baseFpPlanqty)
     {
 
-        List<BaseFpPlanqty> list = baseFpPlanqtyService.selectBaseFpPlanqtyList(null);
-        int id=0;
-        System.out.println(list);
-        if (list!=null||!list.isEmpty()){
-            id= Math.toIntExact(list.get(list.size() - 1).getId()) + 1;
-        }
-        baseFpPlanqty.setId(Long.valueOf(id));
+
         return toAjax(baseFpPlanqtyService.insertBaseFpPlanqty(baseFpPlanqty));
     }
 

ruoyi-system/src/main/resources/mapper/system/BaseFpPlanqtyMapper.xml

@@ -4,13 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.BaseFpPlanqtyMapper">
     
-    <resultMap type="BaseFpPlanqty" id="BaseFpPlanqtyResult">
+    <resultMap type="com.ruoyi.system.domain.BaseFpPlanqty" id="BaseFpPlanqtyResult">
         <result property="qty"    column="qty"    />
         <result property="id"    column="id"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectBaseFpPlanqtyVo">
-        select qty, id from base_fp_planqty
+        select qty, id,create_time from base_fp_planqty
     </sql>
 
     <select id="selectBaseFpPlanqtyList" parameterType="BaseFpPlanqty" resultMap="BaseFpPlanqtyResult">

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -405,30 +405,56 @@
     </select>
 
     <select id="fp_selectOrderExecutionPlan" resultType="com.ruoyi.system.domain.OrderInfo">
-        select substr(MATERIAL_NAME,
+--     select substr(MATERIAL_NAME,
+--                       case
+--                           when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+--                           else instr(MATERIAL_NAME, '/', 1, 1) + 1
+--                           end,
+--                       case
+--                           when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
+--                           else instr(MATERIAL_NAME, ',', 1, 2)
+--                           end
+--                           -
+--                       case
+--                           when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+--                           else instr(MATERIAL_NAME, '/', 1, 1) + 1
+--                           end)     as name,
+--                nvl(plan_number, 0) as plan_number,
+--                nvl(sum(PRODUCT_QTY) ,0)   as actual_number,
+--                 case when nvl(plan_number, 0) =0 then 100.00 else
+--                round(  nvl(sum(PRODUCT_QTY) ,0)/nvl(plan_number, 1)*100,2) end as rate
+--         from IMOS_PR_FOAMING_MONITOR irfm
+--                  left join   (
+--             select PLAN_QTY plan_number, MATERIAL_NAME as name1,MATERIAL_CODE as code
+--             from imos_ta_material
+--             where DISPLAY_FLAG = 1) plan on plan.code = replace(MATERIAL_CODE,chr(10),'')
+--               where PRODUCT_QTY > 0
+--         group by MATERIAL_NAME, plan_number
+
+    select substr(plan.name1,
                       case
-                          when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
-                          else instr(MATERIAL_NAME, '/', 1, 1) + 1
+                          when instr(plan.name1, '/', 1, 1) = 0 then instr(plan.name1, ',', 1, 1) + 1
+                          else instr(plan.name1, '/', 1, 1) + 1
                           end,
                       case
-                          when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
-                          else instr(MATERIAL_NAME, ',', 1, 2)
+                          when instr(plan.name1, ',', 1, 2) = 0 then Length(plan.name1) + 1
+                          else instr(plan.name1, ',', 1, 2)
                           end
                           -
                       case
-                          when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
-                          else instr(MATERIAL_NAME, '/', 1, 1) + 1
+                          when instr(plan.name1, '/', 1, 1) = 0 then instr(plan.name1, ',', 1, 1) + 1
+                          else instr(plan.name1, '/', 1, 1) + 1
                           end)     as name,
                nvl(plan_number, 0) as plan_number,
-               sum(PRODUCT_QTY)    as actual_number,
-               round( sum(PRODUCT_QTY)/nvl(plan_number, 1)*100,2) as rate
+               nvl(sum(PRODUCT_QTY) ,0)   as actual_number,
+               round(  nvl(sum(PRODUCT_QTY) ,0)/nvl(plan_number, 1)*100,2) as rate
         from IMOS_PR_FOAMING_MONITOR irfm
-                 left join (
-            select PLAN_QTY plan_number, MATERIAL_NAME as name1
+                 RIGHT JOIN  (
+            select PLAN_QTY plan_number, MATERIAL_NAME as name1,MATERIAL_CODE as code
             from imos_ta_material
-            where DISPLAY_FLAG = 1) plan on plan.name1 = MATERIAL_NAME
-        where PRODUCT_QTY > 0 and plan_number>0
-        group by MATERIAL_NAME, plan_number
+            where DISPLAY_FLAG = 1) plan on plan.code = replace(MATERIAL_CODE,chr(10),'')
+
+        group by plan.name1, plan_number
     </select>
     <select id="selectFpOrderInfo" resultType="com.ruoyi.system.domain.BoxOutput">
         select sum(PLAN_QTY) qty, '当班计划' as name
@@ -676,7 +702,9 @@ where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
                           else instr(MATERIAL_NAME, '/', 1, 1) + 1
                           end)                               as name,
                STATION_NO,
-               0                                             as target,
+                  (select QTY
+        from (select QTY, row_number() over (order by CREATE_TIME desc) row_n from HAIWEI.BASE_FP_PLANQTY)
+        where row_n = 1)  as target,
                case
                    when PRODUCT_STATUS = 0 then '未生产'
                    else '生产中' end                            as status,

ruoyi-system/src/main/resources/templates/system/base_planqty/base_planqty.html

@@ -20,15 +20,15 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_planqty:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:base_planqty:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:base_planqty:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_planqty:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:base_planqty:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:base_planqty:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
@@ -52,18 +52,24 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "发泡线工位目标",
+                sortName:'createTime',
+                sortOrder:'desc',
                 columns: [{
                     checkbox: true
                 },
                 {
                     field: 'qty',
                     title: '目标数'
+                }, {
+                    field: 'createTime',
+                    title: '创建时间'
                 },
                 {
                     field: 'id',
-                    title: '${comment}',
+                    title: '主键',
                     visible: false
                 },
+
                 {
                     title: '操作',
                     align: 'center',