admin
2024-07-12 2aae2ddd866c3fc88f37c44f69a38f6de076b502
人工工位未做完工序给plc回22 未扫总成码回26
已修改4个文件
38 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/kb/stationTerminal/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -46,6 +46,21 @@
    private MiloService miloService;
    /**
     * 未做完工序回复plc信号
     */
    @GetMapping("/unfinishedProcess")
    public AjaxResult unfinishedProcess(BsFormulaChildInfo bsFormulaChildInfo)
    {
        try {
            String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        return AjaxResult.success();
    }
    /**
     * 扫码确认
     */
    @GetMapping("/initializedData")
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
@@ -116,6 +116,9 @@
    private String workOrderNo;
    @TableField(exist = false)
    private Integer recordDataDone;
    @TableField(exist = false)
    private Date collectionTime;
    @TableField(exist = false)
jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
@@ -37,6 +37,15 @@
  })
}
export function unfinishedProcess(query) {
  return request({
    url: '/bs/formulaChild/unfinishedProcess',
    method: 'get',
    params: query
  })
}
// 查询配方配置子信息列表
export function initializedData(query) {
  return request({
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -302,7 +302,7 @@
  fistSetpNumber, initializedData,
  listFormulaChild,
  noPageListFormulaChild,
  releaseCheck,
  releaseCheck, unfinishedProcess,
  updateResults,
  updateTighteningFormula,
  workpieceRelease
@@ -738,18 +738,13 @@
          if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
            self.$message('总成码为空,请扫码!')
            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
            return;
          }
          // if(self.headContent.cardCode === null || self.headContent.cardCode === ''){
          //   self.$alert('<strong style="color: red;font-size: 30px">未扫描小车码禁止放行</strong>', '提示', {
          //     dangerouslyUseHTMLString: true
          //   });
          //   return;
          // }
          if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
            self.$message('未做完工序禁止放行');
            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
            return;
          }