Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java

@@ -115,4 +115,8 @@ public interface BroadDataMapper {
     List<BoxOutput> yue_selectMonthQANumber();
 
     List<BoxOutput> pqk_selectProductInStore();
+
+    void deleteWorkTime();
+
+    void deleteBoxOutput();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java

@@ -18,14 +18,17 @@ import java.util.List;
 public class BroadDruidServiceImpl implements IBroadDruidService {
     @Autowired
     private BroadDataMapper mapper;
-//定时生成产量
+//定时删除数据
     public void createWork(){
-        BoxOutput boxOutput=mapper.selectNowXkOutPut();
-        int nowOut=boxOutput.getQty();
-        int qty=mapper.selectXK_H_QTY(); //上一条
-        int zsQty=mapper.selectNowXkOutPut1();
-        int cha=nowOut-qty;
-        mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,nowOut);
+//        BoxOutput boxOutput=mapper.selectNowXkOutPut();
+//        int nowOut=boxOutput.getQty();
+//        int qty=mapper.selectXK_H_QTY(); //上一条
+//        int zsQty=mapper.selectNowXkOutPut1();
+//        int cha=nowOut-qty;
+//        mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,nowOut);
+
+        mapper.deleteWorkTime();
+        mapper.deleteBoxOutput();
     }
 
     @Override

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

@@ -11,6 +11,13 @@
 
     </resultMap>
 
+    <delete id="deleteWorkTime">
+        delete from HAIWEI.BASE_DAY_WBTIME where CREATE_TIME &lt;  sysdate - interval '15' DAY
+    </delete>
+    <delete id="deleteBoxOutput">
+        delete from IMOS.BASE_BOX_OUTPUT_RECORD  where CREATE_TIME &lt;  sysdate - interval '10' DAY
+    </delete>
+
     <select id="selectplanCompletion" resultType="com.ruoyi.system.domain.BoxOutput">
         select sum(PLAN_QTY) qty, '计划数量' as name
         from imos_ta_material
@@ -24,7 +31,7 @@
         case when sysdate &lt;= wb.W_END then W_START else W_END end
         and
         case when sysdate &lt;= wb.W_END then W_END else B_END end
-        and QTY3 > 0
+        and QTY3 &gt; 0
     </select>
 
     <select id="selectStock" resultType="com.ruoyi.system.domain.BoxStock">