添加 工程信息显示流程卡功能

huang

2024-12-23 79f094ecc2d1b7bec8c577fa6237a615cdb8773b

添加 工程信息显示流程卡功能

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue

@@ -209,6 +209,17 @@
  },

})
const processCardColumns = reactive([
  {field: 'process_id', title: '流程卡', width: 200},
  {field: 'project', title: '项目名', width: 150},
  {field: 'order_number', title: '项目名', width: 150},
  {field: 'width', title: '宽', width: 150},
  {field: 'height', title: '高', width: 150},
  {field: 'technology_number', title: '层', width: 150},
  {field: 'layout_status', title: '总层数', width: 150},
  {field: 'quantity', title: '数量', width: 150},
]);

// 右键菜单
const operationConfigs = [
  {
@@ -226,7 +237,9 @@
    gridRef: xGrid,
    requiresRow: false,
    showMessage: () => {
      ElMessage.info('此功能暂未完善，暂时无法执行显示流程卡操作。');
      getProcessCard();
      processCardDialogVisible.value = true;
      ElMessage.info('操作成功！');
    }
  },
  {
@@ -235,6 +248,7 @@
    gridRef: xGrid,
    requiresRow: false,
    showMessage: () => {
      processCardDialogVisible.value = false;
      ElMessage.info('此功能暂未完善，暂时无法执行隐藏流程卡操作。');
    }
  },
@@ -294,7 +308,7 @@
          if (config.code === 'setAmount') {
            config.openAmount();
            ElMessage.success(config.successMsg);
          }else if (['displayProcessCard', 'hideProcessCard', 'setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
          } else if (['displayProcessCard', 'hideProcessCard', 'setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
            config.showMessage();
          }
        }).catch(() => {
@@ -363,6 +377,22 @@
    fetchData();
  }
});

// 流程卡窗口
const processCardDialogVisible = ref(false);
// 用于存储流程卡数据
const processCardData = ref(null);
//流程卡
const getProcessCard = () => {
  const projectNo = ref('P24120301')
  request.post(`/glassOptimize/getProcessCard/${projectNo.value}`).then((res) => {
    if (Number(res.code) === 200) {
      processCardData.value = res.data.data;
    } else {
      ElMessage.warning(res.msg);
    }
  });
};

// 从子组件SetAmount获取磨量值，并更新表格数据
const Amount = (amountData) => {
@@ -514,6 +544,23 @@
      </template>
    </vxe-grid>

    <!-- 流程卡表格 -->
    <el-dialog
        v-model="processCardDialogVisible"
        title="流程卡数据"
        width="80%"
        heigth="600px"
        style="height: 80%;"
    >
      <vxe-grid
          height="100%"
          class="mytable - scrollbar"
          :data="processCardData"
          :columns="processCardColumns"
      >
      </vxe-grid>
    </el-dialog>

  </div>
</template>


 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java

@@ -29,6 +29,14 @@
        return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
    }

    //工程信息流程卡
    @ApiOperation("工程信息流程卡接口")
    @PostMapping  ("/getProcessCard/{projectNo}")
    public Result getProcessCard(
            @PathVariable String projectNo){
        return Result.seccess(glassOptimizeService.getProcessCardSv(projectNo));
    }

    //库存信息
    @ApiOperation("库存信息接口")
    @PostMapping  ("/materialStore/{thickness}/{model}")

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java

@@ -15,6 +15,9 @@
    //工程信息
    List<Map<String, Object>> projectInfoMp(String projectNo);

    //工程信息流程卡
    List<Map<String, Object>> getProcessCardMp(String projectNo);

    //库存信息
    List<Map<String, Object>>  materialStoreMp(String thickness, String model);


 north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java

@@ -29,6 +29,13 @@
        return map;
    }

    //工程信息流程卡
    public Map<String, Object> getProcessCardSv(String projectNo) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", glassOptimizeMapper.getProcessCardMp(projectNo));
        return map;
    }

    //库存信息
    public Map<String, Object> materialStoreSv(String thickness, String model) {
        Map<String, Object> map = new HashMap<>();

 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -89,6 +89,29 @@
            f.order_number;
    </select>

    <!--工程信息流程卡-->
    <select id="getProcessCardMp">
        SELECT
            fc.process_id,
            fc.order_number,
            fc.technology_number,
            fc.quantity,
            fc.layout_status,
            so.project,
            sd.child_width AS width,
            sd.child_height AS height
        FROM
            pp.flow_card AS fc
                INNER JOIN sd.order AS so ON fc.order_id = so.order_id
                INNER JOIN sd.order_glass_detail AS sd ON sd.order_id = so.order_id AND fc.order_id = sd.order_id
        WHERE
            fc.project_no = #{projectNo}
        GROUP BY
            fc.order_id,
            fc.order_number,
            fc.technology_number ;
    </select>

    <!--库存信息-->
    <select id="materialStoreMp">
        SELECT