zhangxin 1 rok pred
rodič
commit
c0b806a5c9

+ 0 - 27
ruoyi-admin/src/main/java/com/ruoyi/thread/ServerGs.java

@@ -91,33 +91,6 @@ public class ServerGs {
                                 Thread.sleep(200);
                             }
 
-//                            for (int i = 0; i < list.size(); i++) {
-//                                //发送检测信号到光栅PLC
-//                                switch (list.get(i).getConfigKey()) {
-//                                    case "sys.guangshan.no1":
-//                                        // 光栅1 发送检测信号
-////                                        log.info("------------光栅1 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00010D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no2":
-//                                        // 光栅2 发送检测信号
-////                                        log.info("------------光栅2 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00020D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no3":
-//                                        // 光栅3 发送检测信号
-////                                        log.info("------------光栅3 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00030D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no4":
-//                                        // 光栅4 发送检测信号
-////                                        log.info("------------光栅4 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00040D0A"));
-//                                        break;
-//                                }
-//                                os.flush();
-//                                Thread.sleep(200);
-//                            }
                         } catch (Exception e) {
                             log.error("光栅客户端断开:" + e.getMessage());
                             //关闭连接

+ 0 - 104
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/qc/DocQcHeaderController.java

@@ -1,104 +0,0 @@
-package com.ruoyi.web.controller.warewms.wms.qc;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.ams.qc.domain.DocQcHeader;
-import com.ruoyi.ams.qc.service.IDocQcHeaderService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 质检Controller
- * 
- * @author ruoyi
- * @date 2022-11-14
- */
-@RestController
-@RequestMapping("/docQc/docQcHeader")
-public class DocQcHeaderController extends BaseController
-{
-    @Autowired
-    private IDocQcHeaderService docQcHeaderService;
-
-    /**
-     * 查询质检列表
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocQcHeader docQcHeader)
-    {
-        startPage();
-        List<DocQcHeader> list = docQcHeaderService.selectDocQcHeaderList(docQcHeader);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出质检列表
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:export')")
-    @Log(title = "质检", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocQcHeader docQcHeader)
-    {
-        List<DocQcHeader> list = docQcHeaderService.selectDocQcHeaderList(docQcHeader);
-        ExcelUtil<DocQcHeader> util = new ExcelUtil<DocQcHeader>(DocQcHeader.class);
-        util.exportExcel(response, list, "质检数据");
-    }
-
-    /**
-     * 获取质检详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:query')")
-    @GetMapping(value = "/{qcno}")
-    public AjaxResult getInfo(@PathVariable("qcno") String qcno)
-    {
-        return AjaxResult.success(docQcHeaderService.selectDocQcHeaderByQcno(qcno));
-    }
-
-    /**
-     * 新增质检
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:add')")
-    @Log(title = "质检", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocQcHeader docQcHeader)
-    {
-        return toAjax(docQcHeaderService.insertDocQcHeader(docQcHeader));
-    }
-
-    /**
-     * 修改质检
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:edit')")
-    @Log(title = "质检", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocQcHeader docQcHeader)
-    {
-        return toAjax(docQcHeaderService.updateDocQcHeader(docQcHeader));
-    }
-
-    /**
-     * 删除质检
-     */
-    @PreAuthorize("@ss.hasPermi('docQc:docQcHeader:remove')")
-    @Log(title = "质检", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{qcnos}")
-    public AjaxResult remove(@PathVariable String[] qcnos)
-    {
-        return toAjax(docQcHeaderService.deleteDocQcHeaderByQcnos(qcnos));
-    }
-}