ly 生产记录

master/src/main/java/com/ruoyi/project/production/controller/TPrdRecordController.java

@@ -16,6 +16,7 @@ import com.ruoyi.project.plant.service.ITMtdDailyService;
 import com.ruoyi.project.production.domain.TPrdRecordItem;
 import com.ruoyi.project.production.mapper.TPrdRecordItemMapper;
 import com.ruoyi.project.production.mapper.TPrdRecordMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
@@ -97,13 +98,14 @@ public class TPrdRecordController extends BaseController
         TPrdRecordItem query = new TPrdRecordItem();
         query.setDailyId(param.getId());
         List<TPrdRecordItem> items = tPrdRecordItemMapper.selectTPrdRecordItemList(query);
+        tPrdRecord.setItems(items);
         // 创建一个 Word 文档
         XWPFDocument document = new XWPFDocument();
         try {
             // 创建输出文件的路径
             FileOutputStream out = null;
             // 添加每日的记录
-            addDayContent(document, tPrdRecord.getRecordDate(), items);
+            addDayContent(document, tPrdRecord);
             // 将内容写入文件
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile("daily_report.docx"));
             document.write(out);
@@ -133,8 +135,9 @@ public class TPrdRecordController extends BaseController
                 TPrdRecordItem query = new TPrdRecordItem();
                 query.setDailyId(t.getId());
                 List<TPrdRecordItem> items = tPrdRecordItemMapper.selectTPrdRecordItemList(query);
+                t.setItems(items);
                 // 添加每日的记录
-                addDayContent(document, t.getRecordDate(), items);
+                addDayContent(document, t);
             }
 
 
@@ -152,7 +155,10 @@ public class TPrdRecordController extends BaseController
 
 
     // 添加每日的内容
-    private static void addDayContent(XWPFDocument document, Date date, List<TPrdRecordItem> items) {
+    private static void addDayContent(XWPFDocument document,TPrdRecord t ) {
+        Date date = t.getRecordDate();
+        List<TPrdRecordItem> items = t.getItems();
+        String remarks = t.getRemarks();
         // 添加日期为标题
         XWPFParagraph dateParagraph = document.createParagraph();
         XWPFRun dateRun = dateParagraph.createRun();
@@ -164,6 +170,10 @@ public class TPrdRecordController extends BaseController
         String formattedDate = dateFormat.format(date); // 将日期转换为字符串
         dateRun.setText(formattedDate);
 
+        XWPFParagraph dateParagraph2 = document.createParagraph();
+        XWPFRun dateRun2 = dateParagraph2.createRun();
+        dateRun2.setBold(true);
+        dateRun2.setText("生产记录");
 
         // 添加条目列表
         for (int i = 0; i < items.size(); i++) {
@@ -171,10 +181,21 @@ public class TPrdRecordController extends BaseController
             XWPFRun itemRun = itemParagraph.createRun();
             itemRun.setText((i + 1) + "、\t" + items.get(i).getDescription());
         }
+        //异常
+        if (StringUtils.isNotEmpty(remarks)) {
+            // 添加日期为标题
+            XWPFParagraph markParagraph = document.createParagraph();
+            XWPFRun markRun = markParagraph.createRun();
+            markRun.setBold(true);
+            markRun.setText("异常情况记录");
+
+            XWPFParagraph markParagraph2 = document.createParagraph();
+            XWPFRun markRun2 = markParagraph2.createRun();
+            markRun2.setText(remarks);
+        }
         // 添加空白
-        XWPFParagraph dateParagraph2 = document.createParagraph();
-        XWPFRun dateRun2 = dateParagraph2.createRun();
-        dateRun2.addCarriageReturn();
+        XWPFParagraph endParagraph = document.createParagraph();
+        XWPFRun endRun = endParagraph.createRun();
     }
 
     public void syncMeeting(long meetingId){

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.pssr.controller;
 import java.util.List;
 
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
 import com.ruoyi.project.pssr.mapper.TPssrSubcontentMapper;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
@@ -43,7 +44,8 @@ public class TPssrPipeController extends BaseController
     private TSpecdevYlgdMapper tSpecdevYlgdMapper;
     @Resource
     private TPssrSubcontentMapper tPssrSubcontentMapper;
-
+    @Autowired
+    private TPssrPipeMapper tPssrPipeMapper;
     /**
      * 查询管道列表
      */
@@ -68,6 +70,9 @@ public class TPssrPipeController extends BaseController
         tSpecdevYlgd.setPlantCode("BCC");
         tSpecdevYlgd.setDevno("-" + subcontent.getUnit());
         List<TSpecdevYlgd> list = tSpecdevYlgdMapper.selectTSpecdevYlgdListForPssr(tSpecdevYlgd);
+
+        //删除老数据
+        tPssrPipeMapper.deleteTPssrPipeBySubId(tPssrPipe.getSubId());
         for (TSpecdevYlgd t: list
              ) {
             TPssrPipe pipe = new TPssrPipe();

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPipeMapper.java

@@ -60,4 +60,6 @@ public interface TPssrPipeMapper
      * @return 结果
      */
     public int deleteTPssrPipeByIds(Long[] ids);
+
+    void deleteTPssrPipeBySubId(Long subId);
 }

master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -146,6 +146,11 @@
         update t_pssr_pipe set del_flag = 2 where id = #{id}
     </update>
 
+    <update id="deleteTPssrPipeBySubId" parameterType="Long">
+        update t_pssr_pipe set del_flag = 2 where sub_id = #{subId}
+    </update>
+
+
     <update id="deleteTPssrPipeByIds" parameterType="String">
         update t_pssr_pipe set del_flag = 2 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -153,4 +158,4 @@
         </foreach>
     </update>
 
-</mapper>
+</mapper>

ui/src/views/production/prdRecord/index.vue

@@ -76,7 +76,7 @@
 
 
 
-      <el-table-column label="备注" align="center" prop="remarks"  width="400" />
+      <el-table-column label="异常情况记录" align="center" prop="remarks"  width="400" />
       <el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -139,7 +139,7 @@
 
         </el-card>
         <el-button style="text-align: center" @click="addItem(3)">新增</el-button>
-        <el-form-item label="备注" prop="remarks">
+        <el-form-item label="异常情况记录" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
       </el-form>

ui/src/views/pssr/pipe/index.vue

@@ -155,8 +155,8 @@
           type="success"
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
-          @click="handleUpdate"
+          :disabled="multiple"
+          @click="handleBatch"
           v-hasPermi="['pssr:pipe:edit']"
         >批量操作</el-button>
       </el-col>
@@ -463,6 +463,10 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加管道";
+    },
+    handleBatch(){
+
+
     },
     //同步特种设备数据
     handleSync(){
@@ -470,7 +474,7 @@ export default {
       syncPipe(this.queryParams).then(response => {
         this.pipeList = response.rows;
         this.total = response.total;
-        this.loading = false;
+        this.getList();
       });
     },
     /** 修改按钮操作 */