基础信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdLinetypeController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TBdLinetype;
+import com.ruoyi.nanjing.service.ITBdLinetypeService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 主支线管理Controller
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Controller
+@RequestMapping("/nanjing/LineType")
+public class TBdLinetypeController extends BaseController
+{
+    private String prefix = "nanjing/LineType";
+
+    @Autowired
+    private ITBdLinetypeService tBdLinetypeService;
+
+    @RequiresPermissions("nanjing:LineType:view")
+    @GetMapping()
+    public String LineType()
+    {
+        return prefix + "/LineType";
+    }
+
+    /**
+     * 查询主支线管理列表
+     */
+    @RequiresPermissions("nanjing:LineType:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TBdLinetype tBdLinetype)
+    {
+        startPage();
+        List<TBdLinetype> list = tBdLinetypeService.selectTBdLinetypeList(tBdLinetype);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出主支线管理列表
+     */
+    @RequiresPermissions("nanjing:LineType:export")
+    @Log(title = "主支线管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TBdLinetype tBdLinetype)
+    {
+        List<TBdLinetype> list = tBdLinetypeService.selectTBdLinetypeList(tBdLinetype);
+        ExcelUtil<TBdLinetype> util = new ExcelUtil<TBdLinetype>(TBdLinetype.class);
+        return util.exportExcel(list, "LineType");
+    }
+
+    /**
+     * 新增主支线管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存主支线管理
+     */
+    @RequiresPermissions("nanjing:LineType:add")
+    @Log(title = "主支线管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TBdLinetype tBdLinetype)
+    {
+        return toAjax(tBdLinetypeService.insertTBdLinetype(tBdLinetype));
+    }
+
+    /**
+     * 修改主支线管理
+     */
+    @GetMapping("/edit/{LineID}")
+    public String edit(@PathVariable("LineID") Long LineID, ModelMap mmap)
+    {
+        TBdLinetype tBdLinetype = tBdLinetypeService.selectTBdLinetypeById(LineID);
+        mmap.put("tBdLinetype", tBdLinetype);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存主支线管理
+     */
+    @RequiresPermissions("nanjing:LineType:edit")
+    @Log(title = "主支线管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TBdLinetype tBdLinetype)
+    {
+        return toAjax(tBdLinetypeService.updateTBdLinetype(tBdLinetype));
+    }
+
+    /**
+     * 删除主支线管理
+     */
+    @RequiresPermissions("nanjing:LineType:remove")
+    @Log(title = "主支线管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tBdLinetypeService.deleteTBdLinetypeByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdProductinfoController.java

@@ -0,0 +1,133 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.List;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.nanjing.domain.TBdProducttype;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TBdProductinfo;
+import com.ruoyi.nanjing.service.ITBdProductinfoService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 产品信息Controller
+ * 
+ * @author limy
+ * @date 2021-01-25
+ */
+@Controller
+@RequestMapping("/nanjing/ProductInfo")
+public class TBdProductinfoController extends BaseController
+{
+    private String prefix = "nanjing/ProductInfo";
+
+    @Autowired
+    private ITBdProductinfoService tBdProductinfoService;
+
+    @RequiresPermissions("nanjing:ProductInfo:view")
+    @GetMapping()
+    public String ProductInfo()
+    {
+        return prefix + "/ProductInfo";
+    }
+
+    /**
+     * 查询产品信息列表
+     */
+    @RequiresPermissions("nanjing:ProductInfo:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TBdProductinfo tBdProductinfo)
+    {
+        startPage();
+        List<TBdProductinfo> list = tBdProductinfoService.selectTBdProductinfoList(tBdProductinfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出产品信息列表
+     */
+    @RequiresPermissions("nanjing:ProductInfo:export")
+    @Log(title = "产品信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TBdProductinfo tBdProductinfo)
+    {
+        List<TBdProductinfo> list = tBdProductinfoService.selectTBdProductinfoList(tBdProductinfo);
+        ExcelUtil<TBdProductinfo> util = new ExcelUtil<TBdProductinfo>(TBdProductinfo.class);
+        return util.exportExcel(list, "ProductInfo");
+    }
+
+    /**
+     * 新增产品信息
+     */
+    @GetMapping("/add")
+    public String add(ModelMap map)
+    {
+        List<TBdProductinfo> list = tBdProductinfoService.selectTBdProductinfo();
+        int max = Convert.toInt(list.get(0).getProductID());
+        list.get(0).setProductID(max+1L);
+        map.addAttribute("pt",list);
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存产品信息
+     */
+    @RequiresPermissions("nanjing:ProductInfo:add")
+    @Log(title = "产品信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TBdProductinfo tBdProductinfo)
+    {
+        return toAjax(tBdProductinfoService.insertTBdProductinfo(tBdProductinfo));
+    }
+
+    /**
+     * 修改产品信息
+     */
+    @GetMapping("/edit/{ID}")
+    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        TBdProductinfo tBdProductinfo = tBdProductinfoService.selectTBdProductinfoById(ID);
+        mmap.put("tBdProductinfo", tBdProductinfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存产品信息
+     */
+    @RequiresPermissions("nanjing:ProductInfo:edit")
+    @Log(title = "产品信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TBdProductinfo tBdProductinfo)
+    {
+        return toAjax(tBdProductinfoService.updateTBdProductinfo(tBdProductinfo));
+    }
+
+    /**
+     * 删除产品信息
+     */
+    @RequiresPermissions("nanjing:ProductInfo:remove")
+    @Log(title = "产品信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tBdProductinfoService.deleteTBdProductinfoByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdProducttypeController.java

@@ -0,0 +1,133 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.List;
+
+import com.ruoyi.common.core.text.Convert;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TBdProducttype;
+import com.ruoyi.nanjing.service.ITBdProducttypeService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 机种类型Controller
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Controller
+@RequestMapping("/nanjing/ProductType")
+public class TBdProducttypeController extends BaseController
+{
+    private String prefix = "nanjing/ProductType";
+
+    @Autowired
+    private ITBdProducttypeService tBdProducttypeService;
+
+    @RequiresPermissions("nanjing:ProductType:view")
+    @GetMapping()
+    public String ProductType()
+    {
+        return prefix + "/ProductType";
+    }
+
+    /**
+     * 查询机种类型列表
+     */
+    @RequiresPermissions("nanjing:ProductType:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TBdProducttype tBdProducttype)
+    {
+        startPage();
+        List<TBdProducttype> list = tBdProducttypeService.selectTBdProducttypeList(tBdProducttype);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出机种类型列表
+     */
+    @RequiresPermissions("nanjing:ProductType:export")
+    @Log(title = "机种类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TBdProducttype tBdProducttype)
+    {
+        List<TBdProducttype> list = tBdProducttypeService.selectTBdProducttypeList(tBdProducttype);
+        ExcelUtil<TBdProducttype> util = new ExcelUtil<TBdProducttype>(TBdProducttype.class);
+        return util.exportExcel(list, "ProductType");
+    }
+
+    /**
+     * 新增机种类型
+     */
+    @GetMapping("/add")
+    public String add(ModelMap map)
+    {
+        List<TBdProducttype> list = tBdProducttypeService.selectTBdProducttype();
+        int max = Convert.toInt(list.get(0).getProductTypeID());
+        String oper = max + 1+"";
+        list.get(0).setProductTypeID(oper);
+        map.addAttribute("pt",list);
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存机种类型
+     */
+    @RequiresPermissions("nanjing:ProductType:add")
+    @Log(title = "机种类型", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TBdProducttype tBdProducttype)
+    {
+        return toAjax(tBdProducttypeService.insertTBdProducttype(tBdProducttype));
+    }
+
+    /**
+     * 修改机种类型
+     */
+    @GetMapping("/edit/{ID}")
+    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        TBdProducttype tBdProducttype = tBdProducttypeService.selectTBdProducttypeById(ID);
+        mmap.put("tBdProducttype", tBdProducttype);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存机种类型
+     */
+    @RequiresPermissions("nanjing:ProductType:edit")
+    @Log(title = "机种类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TBdProducttype tBdProducttype)
+    {
+        return toAjax(tBdProducttypeService.updateTBdProducttype(tBdProducttype));
+    }
+
+    /**
+     * 删除机种类型
+     */
+    @RequiresPermissions("nanjing:ProductType:remove")
+    @Log(title = "机种类型", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tBdProducttypeService.deleteTBdProducttypeByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdStationtypeController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TBdStationtype;
+import com.ruoyi.nanjing.service.ITBdStationtypeService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工位类型Controller
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Controller
+@RequestMapping("/nanjing/StationType")
+public class TBdStationtypeController extends BaseController
+{
+    private String prefix = "nanjing/StationType";
+
+    @Autowired
+    private ITBdStationtypeService tBdStationtypeService;
+
+    @RequiresPermissions("nanjing:StationType:view")
+    @GetMapping()
+    public String StationType()
+    {
+        return prefix + "/StationType";
+    }
+
+    /**
+     * 查询工位类型列表
+     */
+    @RequiresPermissions("nanjing:StationType:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TBdStationtype tBdStationtype)
+    {
+        startPage();
+        List<TBdStationtype> list = tBdStationtypeService.selectTBdStationtypeList(tBdStationtype);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工位类型列表
+     */
+    @RequiresPermissions("nanjing:StationType:export")
+    @Log(title = "工位类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TBdStationtype tBdStationtype)
+    {
+        List<TBdStationtype> list = tBdStationtypeService.selectTBdStationtypeList(tBdStationtype);
+        ExcelUtil<TBdStationtype> util = new ExcelUtil<TBdStationtype>(TBdStationtype.class);
+        return util.exportExcel(list, "StationType");
+    }
+
+    /**
+     * 新增工位类型
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存工位类型
+     */
+    @RequiresPermissions("nanjing:StationType:add")
+    @Log(title = "工位类型", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TBdStationtype tBdStationtype)
+    {
+        return toAjax(tBdStationtypeService.insertTBdStationtype(tBdStationtype));
+    }
+
+    /**
+     * 修改工位类型
+     */
+    @GetMapping("/edit/{ID}")
+    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        TBdStationtype tBdStationtype = tBdStationtypeService.selectTBdStationtypeById(ID);
+        mmap.put("tBdStationtype", tBdStationtype);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存工位类型
+     */
+    @RequiresPermissions("nanjing:StationType:edit")
+    @Log(title = "工位类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TBdStationtype tBdStationtype)
+    {
+        return toAjax(tBdStationtypeService.updateTBdStationtype(tBdStationtype));
+    }
+
+    /**
+     * 删除工位类型
+     */
+    @RequiresPermissions("nanjing:StationType:remove")
+    @Log(title = "工位类型", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tBdStationtypeService.deleteTBdStationtypeByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TBdSubstationController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TBdSubstation;
+import com.ruoyi.nanjing.service.ITBdSubstationService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工位管理Controller
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Controller
+@RequestMapping("/nanjing/SubStation")
+public class TBdSubstationController extends BaseController
+{
+    private String prefix = "nanjing/SubStation";
+
+    @Autowired
+    private ITBdSubstationService tBdSubstationService;
+
+    @RequiresPermissions("nanjing:SubStation:view")
+    @GetMapping()
+    public String SubStation()
+    {
+        return prefix + "/SubStation";
+    }
+
+    /**
+     * 查询工位管理列表
+     */
+    @RequiresPermissions("nanjing:SubStation:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TBdSubstation tBdSubstation)
+    {
+        startPage();
+        List<TBdSubstation> list = tBdSubstationService.selectTBdSubstationList(tBdSubstation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工位管理列表
+     */
+    @RequiresPermissions("nanjing:SubStation:export")
+    @Log(title = "工位管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TBdSubstation tBdSubstation)
+    {
+        List<TBdSubstation> list = tBdSubstationService.selectTBdSubstationList(tBdSubstation);
+        ExcelUtil<TBdSubstation> util = new ExcelUtil<TBdSubstation>(TBdSubstation.class);
+        return util.exportExcel(list, "SubStation");
+    }
+
+    /**
+     * 新增工位管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存工位管理
+     */
+    @RequiresPermissions("nanjing:SubStation:add")
+    @Log(title = "工位管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TBdSubstation tBdSubstation)
+    {
+        return toAjax(tBdSubstationService.insertTBdSubstation(tBdSubstation));
+    }
+
+    /**
+     * 修改工位管理
+     */
+    @GetMapping("/edit/{ID}")
+    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        TBdSubstation tBdSubstation = tBdSubstationService.selectTBdSubstationById(ID);
+        mmap.put("tBdSubstation", tBdSubstation);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存工位管理
+     */
+    @RequiresPermissions("nanjing:SubStation:edit")
+    @Log(title = "工位管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TBdSubstation tBdSubstation)
+    {
+        return toAjax(tBdSubstationService.updateTBdSubstation(tBdSubstation));
+    }
+
+    /**
+     * 删除工位管理
+     */
+    @RequiresPermissions("nanjing:SubStation:remove")
+    @Log(title = "工位管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tBdSubstationService.deleteTBdSubstationByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpProductchangeinfoController.java

@@ -0,0 +1,156 @@
+package com.ruoyi.web.controller.nanjing;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.nanjing.domain.TBdProductinfo;
+import com.ruoyi.nanjing.service.ITBdProductinfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.nanjing.domain.TRpProductchangeinfo;
+import com.ruoyi.nanjing.service.ITRpProductchangeinfoService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 机种切换管理Controller
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Controller
+@RequestMapping("/nanjing/ProductChangeInfo")
+public class TRpProductchangeinfoController extends BaseController
+{
+    private String prefix = "nanjing/ProductChangeInfo";
+
+    @Autowired
+    private ITBdProductinfoService tBdProductinfoService;
+    @Autowired
+    private ITRpProductchangeinfoService tRpProductchangeinfoService;
+
+    @RequiresPermissions("nanjing:ProductChangeInfo:view")
+    @GetMapping()
+    public String ProductChangeInfo(ModelMap map)
+    {
+        List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
+        map.addAttribute("list",tBdProductinfoList);
+        return prefix + "/ProductChangeInfo";
+    }
+
+    /**
+     * 查询机种切换管理列表
+     */
+    @RequiresPermissions("nanjing:ProductChangeInfo:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        startPage();
+        List<TRpProductchangeinfo> list = tRpProductchangeinfoService.selectTRpProductchangeinfoList(tRpProductchangeinfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出机种切换管理列表
+     */
+    @RequiresPermissions("nanjing:ProductChangeInfo:export")
+    @Log(title = "机种切换管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        List<TRpProductchangeinfo> list = tRpProductchangeinfoService.selectTRpProductchangeinfoList(tRpProductchangeinfo);
+        ExcelUtil<TRpProductchangeinfo> util = new ExcelUtil<TRpProductchangeinfo>(TRpProductchangeinfo.class);
+        return util.exportExcel(list, "ProductChangeInfo");
+    }
+
+    /**
+     * 新增机种切换管理
+     */
+    @GetMapping("/add")
+    public String add(ModelMap map)
+    {
+        List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
+        map.addAttribute("list",tBdProductinfoList);
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存机种切换管理
+     */
+    @RequiresPermissions("nanjing:ProductChangeInfo:add")
+    @Log(title = "机种切换管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        tRpProductchangeinfo.setInsertTime(new Date());
+        return toAjax(tRpProductchangeinfoService.insertTRpProductchangeinfo(tRpProductchangeinfo));
+    }
+
+    /**
+     * 修改机种切换管理
+     */
+    @GetMapping("/edit/{ID}")
+    public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
+    {
+        List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
+        mmap.addAttribute("list",tBdProductinfoList);
+        TRpProductchangeinfo tRpProductchangeinfo = tRpProductchangeinfoService.selectTRpProductchangeinfoById(ID);
+        mmap.put("tRpProductchangeinfo", tRpProductchangeinfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存机种切换管理
+     */
+    @RequiresPermissions("nanjing:ProductChangeInfo:edit")
+    @Log(title = "机种切换管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        return toAjax(tRpProductchangeinfoService.updateTRpProductchangeinfo(tRpProductchangeinfo));
+    }
+
+    @RequiresPermissions("nanjing:ProductChangeInfo:start")
+    @PostMapping("/start")
+    @ResponseBody
+    public AjaxResult start(HttpServletRequest request){
+        String ids = request.getParameter("id");
+        TRpProductchangeinfo tRpProductchangeinfo = tRpProductchangeinfoService.selectTRpProductchangeinfoById(Convert.toLong(ids));
+        if(tRpProductchangeinfo.getBeginTime()==null){
+            tRpProductchangeinfo.setBeginTime(new Date());
+            return toAjax(tRpProductchangeinfoService.updateTRpProductchangeinfo(tRpProductchangeinfo));
+        }else{
+            return toAjax(0);
+        }
+    }
+
+    /**
+     * 删除机种切换管理
+     */
+    @RequiresPermissions("nanjing:ProductChangeInfo:remove")
+    @Log(title = "机种切换管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(tRpProductchangeinfoService.deleteTRpProductchangeinfoByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=RuoYi_SqlServer
-                username: RuoYi_SqlServer
-                password: password
+                url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=SecondNanjing
+                username: sa
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -17,7 +17,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 80
+  port: 4935
   servlet:
     # 应用的访问路径
     context-path: /
@@ -97,7 +97,7 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: true
+    captchaEnabled: false
     # 验证码类型 math 数组计算 char 字符
     captchaType: math
   cookie:

ruoyi-admin/src/main/resources/templates/nanjing/LineType/LineType.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('主支线管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>产线名称：</label>
+                                <input type="text" name="LineTypeName"/>
+                            </li>
+                            <li>
+                                <label>线路类型：</label>
+                                <select name="LineTypeFlag" th:with="type=${@dict.getType('LineType')}">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()" shiro:hasPermission="nanjing:LineType:add"><i class="fa fa-plus"></i> 添加</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--               -->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:LineType:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:LineType:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:LineType:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:LineType:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:LineType:remove')}]];
+        var prefix = ctx + "nanjing/LineType";
+        var datas = [[${@dict.getType('LineType')}]];
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "主支线管理",
+                columns: [
+                //     {
+                //     checkbox: true
+                // },
+                {
+                    field: 'lineID',
+                    title: '编号',
+                    // sortName:'LineId'
+                    // sortable:true
+                },
+                {
+                    field: 'lineTypeName',
+                    title: '线路名称'
+                },
+                {
+                    field: 'lineTypeFlag',
+                    title: '线路类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
+                },
+
+                {
+                    field: 'barcodeHead',
+                    title: '条码前缀'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.lineID + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.lineID + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/LineType/add.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增主支线管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-LineType-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路名称：</label>
+                <div class="col-sm-8">
+                    <input name="LineTypeName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路类型：</label>
+                <div class="col-sm-8">
+                    <select name="LineTypeFlag" th:with="type=${@dict.getType('LineType')}" class="form-control m-b">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">条码前缀：</label>
+                <div class="col-sm-8">
+                    <input name="BarcodeHead" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/LineType"
+        $("#form-LineType-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-LineType-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/LineType/edit.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改主支线管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-LineType-edit" th:object="${tBdLinetype}">
+            <input name="LineID" th:field="*{LineID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路名称：</label>
+                <div class="col-sm-8">
+                    <input name="LineTypeName" th:field="*{LineTypeName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路类型：</label>
+                <div class="col-sm-8">
+                    <select name="LineTypeFlag" th:field="*{LineTypeFlag}" th:with="type=${@dict.getType('LineType')}" class="form-control m-b">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">条码前缀：</label>
+                <div class="col-sm-8">
+                    <input name="BarcodeHead" th:field="*{BarcodeHead}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/LineType";
+        $("#form-LineType-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-LineType-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/ProductChangeInfo.html

@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('机种切换管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>机种型号：</label>
+<!--                                <input type="text" name="ProductId"/>-->
+                                <select name="ProductId">
+                                    <option value="">全部</option>
+                                    <option th:each="ls:${list}" th:value="${ls.productID}" th:text="${ls.productName}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                生产负责人：
+                                <input type="text" name="PersonInCharge"/>
+                            </li>
+<!--                            <li class="select-time">-->
+<!--                                <label>开始时间：</label>-->
+<!--                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginBeginTime]"/>-->
+<!--                                <span>-</span>-->
+<!--                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endBeginTime]"/>-->
+<!--                            </li>-->
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()" shiro:hasPermission="nanjing:ProductChangeInfo:add"><i class="fa fa-plus"></i> 添加</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--                -->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:ProductChangeInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:ProductChangeInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProductChangeInfo:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:ProductChangeInfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:ProductChangeInfo:remove')}]];
+        var startPlan = [[${@permission.hasPermi('nanjing:ProductChangeInfo:start')}]];
+        var endPlan = [[${@permission.hasPermi('nanjing:ProductChangeInfo:end')}]];
+        var prefix = ctx + "nanjing/ProductChangeInfo";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                // startUrl:prefix+"/start",
+                // endUrl:prefix+"/end",
+                modalName: "机种切换管理",
+                columns: [
+                //     {
+                //     checkbox: true
+                // },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'tBdProductinfo.productName',
+                    title: '机种型号',
+
+                },
+                {
+                    field: 'personInCharge',
+                    title: '生产负责人'
+                },
+                {
+                    field: 'beginTime',
+                    title: '开始时间'
+                },
+                {
+                    field: 'endTime',
+                    title: '结束时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + startPlan + '" href="javascript:void(0)" onclick="startP(\'' + row.id + '\')"><i class="fa fa-edit"></i>开始</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + endPlan + '" href="javascript:void(0)" onclick="endP(\'' + row.id + '\')"><i class="fa fa-remove"></i>结束</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function startP(id){
+            var formData = new FormData();
+            formData.append("id",id);
+            $.ajax({
+                type: "post",
+                url: prefix+"/start",
+                data: formData,
+                contentType: false,
+                processData: false,
+                dataType: "json",
+                success: function (res) {
+                    console.log(res)
+                    if (res >0)
+                        $.table.refresh();
+                }
+            })
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/add.html

@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增机种切换管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductChangeInfo-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种型号：</label>
+                <div class="col-sm-8">
+                    <select name="ProductId" class="form-control">
+                        <option th:each="ls:${list}" th:value="${ls.productID}" th:text="${ls.productName}"></option>
+                    </select>
+<!--                    <input name="ProductId" class="form-control" type="text">-->
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">生产负责人：</label>
+                <div class="col-sm-8">
+                    <input name="PersonInCharge" class="form-control" type="text">
+                </div>
+            </div>
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">开始时间：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <div class="input-group date">-->
+<!--                        <input name="BeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">结束时间：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <div class="input-group date">-->
+<!--                        <input name="EndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">操作员：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input name="Operator" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">插入时间：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <div class="input-group date">-->
+<!--                        <input name="InsertTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductChangeInfo"
+        $("#form-ProductChangeInfo-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-ProductChangeInfo-add').serialize());
+            }
+        }
+
+        $("input[name='BeginTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='EndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='InsertTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/edit.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改机种切换管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductChangeInfo-edit" th:object="${tRpProductchangeinfo}">
+            <input name="ID" th:field="*{ID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种型号：</label>
+                <div class="col-sm-8">
+                    <select name="ProductId" class="form-control" th:field="*{ProductId}">
+                        <option th:each="ls:${list}" th:value="${ls.productID}" th:text="${ls.productName}"></option>
+                    </select>
+<!--                    <input name="ProductId" th:field="*{ProductId}" class="form-control" type="text">-->
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">生产负责人：</label>
+                <div class="col-sm-8">
+                    <input name="PersonInCharge" th:field="*{PersonInCharge}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="BeginTime" th:value="${#dates.format(tRpProductchangeinfo.BeginTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">结束时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="EndTime" th:value="${#dates.format(tRpProductchangeinfo.EndTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductChangeInfo";
+        $("#form-ProductChangeInfo-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-ProductChangeInfo-edit').serialize());
+            }
+        }
+
+        $("input[name='BeginTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='EndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductInfo/ProductInfo.html

@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('产品信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>机种类型：</label>
+                                <select name="productType" th:with="type=${@dict.getType('productType')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+<!--                            <li>-->
+<!--                                制具车条码：-->
+<!--                                <input type="text" name="toolCarNo"/>-->
+<!--                            </li>-->
+                            <li>
+                                <label>标签有无：</label>
+                                <select name="machine" th:with="type=${@dict.getType('ifLable')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+<!--                            <li>-->
+<!--                                <label>标签模板：</label>-->
+<!--                                <input type="text" name="template"/>-->
+<!--                            </li>-->
+                            <li>
+                                <label>标签形式：</label>
+                                <select name="printType" th:with="type=${@dict.getType('pringtType')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()" shiro:hasPermission="nanjing:ProductInfo:add"><i class="fa fa-plus"></i> 新增机种</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:ProductInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:ProductInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProductInfo:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:ProductInfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:ProductInfo:remove')}]];
+        var productTypeDatas = [[${@dict.getType('productType')}]];
+        var machineDatas = [[${@dict.getType('ifLable')}]];
+        var printTypeDatas = [[${@dict.getType('pringtType')}]];
+        var prefix = ctx + "nanjing/ProductInfo";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "产品信息",
+                columns: [
+                //     {
+                //     checkbox: true
+                // },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'productID',
+                    title: '机种ID'
+                },
+                {
+                    field: 'productName',
+                    title: '机种型号'
+                },
+                {
+                    field: 'productType',
+                    title: '机种类型',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(productTypeDatas, value);
+                    }
+                },
+                {
+                    field: 'toolCarNo',
+                    title: '制具车条码'
+                },
+                {
+                    field: 'machine',
+                    title: '标签有无',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(machineDatas, value);
+                    }
+                },
+                {
+                    field: 'template',
+                    title: '标签模板'
+                },
+                {
+                    field: 'printType',
+                    title: '标签形式',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(printTypeDatas, value);
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductInfo/add.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增产品信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductInfo-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种ID：</label>
+                <div class="col-sm-8">
+                    <input name="productID" class="form-control" th:each="pt:${pt}" th:value="${pt.ProductID}" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种型号：</label>
+                <div class="col-sm-8">
+                    <input name="productName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种类型：</label>
+                <div class="col-sm-8">
+                    <select name="productType" class="form-control m-b" th:with="type=${@dict.getType('productType')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制具车条码：</label>
+                <div class="col-sm-8">
+                    <input name="toolCarNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签有无：</label>
+                <div class="col-sm-8">
+                    <select name="machine" class="form-control m-b" th:with="type=${@dict.getType('ifLable')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签模板：</label>
+                <div class="col-sm-8">
+                    <input name="template" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签形式：</label>
+                <div class="col-sm-8">
+                    <select name="printType" class="form-control m-b" th:with="type=${@dict.getType('pringtType')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductInfo"
+        $("#form-ProductInfo-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-ProductInfo-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductInfo/edit.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改产品信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductInfo-edit" th:object="${tBdProductinfo}">
+            <input name="ID" th:field="*{ID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种ID：</label>
+                <div class="col-sm-8">
+                    <input name="productID" th:field="*{productID}" class="form-control" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种型号：</label>
+                <div class="col-sm-8">
+                    <input name="productName" th:field="*{productName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种类型：</label>
+                <div class="col-sm-8">
+                    <select name="productType" class="form-control m-b" th:with="type=${@dict.getType('productType')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{productType}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">制具车条码：</label>
+                <div class="col-sm-8">
+                    <input name="toolCarNo" th:field="*{toolCarNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签有无：</label>
+                <div class="col-sm-8">
+                    <select name="machine" class="form-control m-b" th:with="type=${@dict.getType('ifLable')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{machine}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签模板：</label>
+                <div class="col-sm-8">
+                    <input name="template" th:field="*{template}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">标签形式：</label>
+                <div class="col-sm-8">
+                    <select name="printType" class="form-control m-b" th:with="type=${@dict.getType('pringtType')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{printType}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductInfo";
+        $("#form-ProductInfo-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-ProductInfo-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductType/ProductType.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('机种类型列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>机种名称：</label>
+                                <input type="text" name="ProductTypeName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()" shiro:hasPermission="nanjing:ProductType:add"><i class="fa fa-plus"></i> 添加</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:ProductType:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:ProductType:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProductType:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:ProductType:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:ProductType:remove')}]];
+        var prefix = ctx + "nanjing/ProductType";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "机种类型",
+                columns: [
+                //     {
+                //     checkbox: true
+                // },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'productTypeID',
+                    title: '机种id'
+                },
+                {
+                    field: 'productTypeName',
+                    title: '机种名称'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductType/add.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增机种类型')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductType-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种id：</label>
+                <div class="col-sm-8">
+                    <input name="ProductTypeID" class="form-control" th:each="pt:${pt}" th:value="${pt.ProductTypeID}" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">机种名称：</label>
+                <div class="col-sm-8">
+                    <input name="ProductTypeName" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductType"
+        $("#form-ProductType-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-ProductType-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/ProductType/edit.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改机种类型')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ProductType-edit" th:object="${tBdProducttype}">
+            <input name="ID" th:field="*{ID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种id：</label>
+                <div class="col-sm-8">
+                    <input name="ProductTypeID" th:field="*{ProductTypeID}" class="form-control" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机种名称：</label>
+                <div class="col-sm-8">
+                    <input name="ProductTypeName" th:field="*{ProductTypeName}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/ProductType";
+        $("#form-ProductType-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-ProductType-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/StationType/StationType.html

@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('工位类型列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>类型名称：</label>
+                                <input type="text" name="typeName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()" shiro:hasPermission="nanjing:StationType:add"><i class="fa fa-plus"></i> 添加</a>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:StationType:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:StationType:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:StationType:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:StationType:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:StationType:remove')}]];
+        var prefix = ctx + "nanjing/StationType";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "工位类型",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'typeName',
+                    title: '类型名称'
+                },
+                {
+                    field: 'typeClass',
+                    title: '类型类别'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/StationType/add.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增工位类型')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-StationType-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型名称：</label>
+                <div class="col-sm-8">
+                    <input name="typeName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型类别：</label>
+                <div class="col-sm-8">
+                    <input name="typeClass" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/StationType"
+        $("#form-StationType-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-StationType-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/StationType/edit.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改工位类型')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-StationType-edit" th:object="${tBdStationtype}">
+            <input name="ID" th:field="*{ID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型名称：</label>
+                <div class="col-sm-8">
+                    <input name="typeName" th:field="*{typeName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型类别：</label>
+                <div class="col-sm-8">
+                    <input name="typeClass" th:field="*{typeClass}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/StationType";
+        $("#form-StationType-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-StationType-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html

@@ -0,0 +1,295 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('工位管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+<!--                            <li>-->
+<!--                                <label>工位id：</label>-->
+<!--                                <input type="text" name="StationID"/>-->
+<!--                            </li>-->
+                            <li>
+                                <label>工位代码：</label>
+                                <input type="text" name="StationCode"/>
+                            </li>
+                            <li>
+                                <label>工位类型：</label>
+                                <select name="StationType">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>机台id：</label>
+                                <input type="text" name="MachineID"/>
+                            </li>
+                            <li>
+                                <label>连接id：</label>
+                                <input type="text" name="UniteID"/>
+                            </li>
+                            <li>
+                                <label>实际code：</label>
+                                <input type="text" name="CustomerCode"/>
+                            </li>
+                            <li>
+                                <label>工位名称：</label>
+                                <input type="text" name="StationName"/>
+                            </li>
+                            <li>
+                                <label>父工位id：</label>
+                                <input type="text" name="ParentStationID"/>
+                            </li>
+                            <li>
+                                <label>父工位码：</label>
+                                <input type="text" name="ParentStationCode"/>
+                            </li>
+                            <li>
+                                <label>父工位名：</label>
+                                <input type="text" name="ParentStationName"/>
+                            </li>
+                            <li>
+                                <label>前工位id：</label>
+                                <input type="text" name="PreStationID"/>
+                            </li>
+                            <li>
+                                <label>前工位码：</label>
+                                <input type="text" name="PreStationCode"/>
+                            </li>
+                            <li>
+                                <label>备注：</label>
+                                <input type="text" name="Reamark"/>
+                            </li>
+                            <li>
+                                <label>用户id：</label>
+                                <input type="text" name="UserID"/>
+                            </li>
+<!--                            <li class="select-time">-->
+<!--                                <label>更新时间：</label>-->
+<!--                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateTime]"/>-->
+<!--                                <span>-</span>-->
+<!--                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateTime]"/>-->
+<!--                            </li>-->
+                            <li>
+                                <label>表名称：</label>
+                                <input type="text" name="TableName"/>
+                            </li>
+                            <li>
+                                <label>是否子工位：</label>
+                                <input type="text" name="IsSemi"/>
+                            </li>
+                            <li>
+                                <label>是否弃用工位：</label>
+                                <input type="text" name="IsNGStation"/>
+                            </li>
+                            <li>
+                                <label>数据：</label>
+                                <input type="text" name="HaveData"/>
+                            </li>
+                            <li>
+                                <label>是否显示：</label>
+                                <select name="IsShow">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>是否有效，上位机使用该字段：</label>
+                                <input type="text" name="UseFlag"/>
+                            </li>
+                            <li>
+                                <label>参数个数：</label>
+                                <input type="text" name="paraCount"/>
+                            </li>
+                            <li>
+                                <label>排序id：</label>
+                                <input type="text" name="OrderID"/>
+                            </li>
+                            <li>
+                                <label>限制id：</label>
+                                <input type="text" name="LimitID"/>
+                            </li>
+                            <li>
+                                <label>图片路径：</label>
+                                <input type="text" name="ImageUrl"/>
+                            </li>
+                            <li>
+                                <label>线路id：</label>
+                                <input type="text" name="LineID"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="nanjing:SubStation:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:SubStation:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:SubStation:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:SubStation:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('nanjing:SubStation:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('nanjing:SubStation:remove')}]];
+        var prefix = ctx + "nanjing/SubStation";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "工位管理",
+                columns: [{
+                    checkbox: true
+                },
+                    {
+                        field: 'OrderID',
+                        title: '排序id'
+                    },
+                // {
+                //     field: 'ID',
+                //     title: 'id',
+                //     visible: false
+                // },
+                // {
+                //     field: 'StationID',
+                //     title: '工位id'
+                // },
+                {
+                    field: 'stationCode',
+                    title: '工位代码'
+                },
+                    {
+                        field: 'stationName',
+                        title: '工位名称'
+                    },
+                {
+                    field: 'stationType',
+                    title: '工位类型'
+                },
+                // {
+                //     field: 'MachineID',
+                //     title: '机台id'
+                // },
+                // {
+                //     field: 'UniteID',
+                //     title: '连接id'
+                // },
+                // {
+                //     field: 'CustomerCode',
+                //     title: '实际code'
+                // },
+                //
+                // {
+                //     field: 'ParentStationID',
+                //     title: '父工位id'
+                // },
+                // {
+                //     field: 'ParentStationCode',
+                //     title: '父工位码'
+                // },
+                // {
+                //     field: 'ParentStationName',
+                //     title: '父工位名'
+                // },
+                // {
+                //     field: 'PreStationID',
+                //     title: '前工位id'
+                // },
+                // {
+                //     field: 'PreStationCode',
+                //     title: '前工位码'
+                // },
+                // {
+                //     field: 'Reamark',
+                //     title: '备注'
+                // },
+                // {
+                //     field: 'UserID',
+                //     title: '用户id'
+                // },
+                // {
+                //     field: 'UpdateTime',
+                //     title: '更新时间'
+                // },
+                // {
+                //     field: 'TableName',
+                //     title: '表名称'
+                // },
+                // {
+                //     field: 'IsSemi',
+                //     title: '是否子工位'
+                // },
+                // {
+                //     field: 'IsNGStation',
+                //     title: '是否弃用工位'
+                // },
+                // {
+                //     field: 'HaveData',
+                //     title: '数据'
+                // },
+                // {
+                //     field: 'IsShow',
+                //     title: '是否显示'
+                // },
+                // {
+                //     field: 'UseFlag',
+                //     title: '是否有效，上位机使用该字段'
+                // },
+                {
+                    field: 'paraCount',
+                    title: '参数个数'
+                },
+                // {
+                //     field: 'LimitID',
+                //     title: '限制id'
+                // },
+                // {
+                //     field: 'ImageUrl',
+                //     title: '图片路径'
+                // },
+                {
+                    field: 'lineID',
+                    title: '线路id'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ID + '\')"><i class="fa fa-edit"></i>修改</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ID + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html

@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增工位管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-SubStation-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位id：</label>
+                <div class="col-sm-8">
+                    <input name="StationID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位代码：</label>
+                <div class="col-sm-8">
+                    <input name="StationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位类型：</label>
+                <div class="col-sm-8">
+                    <select name="StationType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机台id：</label>
+                <div class="col-sm-8">
+                    <input name="MachineID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">连接id：</label>
+                <div class="col-sm-8">
+                    <input name="UniteID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">实际code：</label>
+                <div class="col-sm-8">
+                    <input name="CustomerCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位名称：</label>
+                <div class="col-sm-8">
+                    <input name="StationName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位id：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位码：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位名：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前工位id：</label>
+                <div class="col-sm-8">
+                    <input name="PreStationID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前工位码：</label>
+                <div class="col-sm-8">
+                    <input name="PreStationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="Reamark" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户id：</label>
+                <div class="col-sm-8">
+                    <input name="UserID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">表名称：</label>
+                <div class="col-sm-8">
+                    <input name="TableName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否子工位：</label>
+                <div class="col-sm-8">
+                    <input name="IsSemi" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否弃用工位：</label>
+                <div class="col-sm-8">
+                    <input name="IsNGStation" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数据：</label>
+                <div class="col-sm-8">
+                    <input name="HaveData" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否显示：</label>
+                <div class="col-sm-8">
+                    <select name="IsShow" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否有效，上位机使用该字段：</label>
+                <div class="col-sm-8">
+                    <input name="UseFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">参数个数：</label>
+                <div class="col-sm-8">
+                    <input name="paraCount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">排序id：</label>
+                <div class="col-sm-8">
+                    <input name="OrderID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">限制id：</label>
+                <div class="col-sm-8">
+                    <input name="LimitID" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">图片路径：</label>
+                <div class="col-sm-8">
+                    <input name="ImageUrl" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路id：</label>
+                <div class="col-sm-8">
+                    <input name="LineID" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/SubStation"
+        $("#form-SubStation-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-SubStation-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/nanjing/SubStation/edit.html

@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改工位管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-SubStation-edit" th:object="${tBdSubstation}">
+            <input name="ID" th:field="*{ID}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位id：</label>
+                <div class="col-sm-8">
+                    <input name="StationID" th:field="*{StationID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位代码：</label>
+                <div class="col-sm-8">
+                    <input name="StationCode" th:field="*{StationCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位类型：</label>
+                <div class="col-sm-8">
+                    <select name="StationType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机台id：</label>
+                <div class="col-sm-8">
+                    <input name="MachineID" th:field="*{MachineID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">连接id：</label>
+                <div class="col-sm-8">
+                    <input name="UniteID" th:field="*{UniteID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">实际code：</label>
+                <div class="col-sm-8">
+                    <input name="CustomerCode" th:field="*{CustomerCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工位名称：</label>
+                <div class="col-sm-8">
+                    <input name="StationName" th:field="*{StationName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位id：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationID" th:field="*{ParentStationID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位码：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationCode" th:field="*{ParentStationCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">父工位名：</label>
+                <div class="col-sm-8">
+                    <input name="ParentStationName" th:field="*{ParentStationName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前工位id：</label>
+                <div class="col-sm-8">
+                    <input name="PreStationID" th:field="*{PreStationID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前工位码：</label>
+                <div class="col-sm-8">
+                    <input name="PreStationCode" th:field="*{PreStationCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="Reamark" th:field="*{Reamark}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户id：</label>
+                <div class="col-sm-8">
+                    <input name="UserID" th:field="*{UserID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">表名称：</label>
+                <div class="col-sm-8">
+                    <input name="TableName" th:field="*{TableName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否子工位：</label>
+                <div class="col-sm-8">
+                    <input name="IsSemi" th:field="*{IsSemi}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否弃用工位：</label>
+                <div class="col-sm-8">
+                    <input name="IsNGStation" th:field="*{IsNGStation}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数据：</label>
+                <div class="col-sm-8">
+                    <input name="HaveData" th:field="*{HaveData}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否显示：</label>
+                <div class="col-sm-8">
+                    <select name="IsShow" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否有效，上位机使用该字段：</label>
+                <div class="col-sm-8">
+                    <input name="UseFlag" th:field="*{UseFlag}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">参数个数：</label>
+                <div class="col-sm-8">
+                    <input name="paraCount" th:field="*{paraCount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">排序id：</label>
+                <div class="col-sm-8">
+                    <input name="OrderID" th:field="*{OrderID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">限制id：</label>
+                <div class="col-sm-8">
+                    <input name="LimitID" th:field="*{LimitID}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">图片路径：</label>
+                <div class="col-sm-8">
+                    <input name="ImageUrl" th:field="*{ImageUrl}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">线路id：</label>
+                <div class="col-sm-8">
+                    <input name="LineID" th:field="*{LineID}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "nanjing/SubStation";
+        $("#form-SubStation-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-SubStation-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdLinetype.java

@@ -0,0 +1,79 @@
+package com.ruoyi.nanjing.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 主支线管理对象 T_BD_LineType
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public class TBdLinetype extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long LineID;
+
+    /** 线路名称 */
+    @Excel(name = "线路名称")
+    private String LineTypeName;
+
+    /** 线路类型 */
+    @Excel(name = "线路类型")
+    private String LineTypeFlag;
+
+    /** 条码前缀 */
+    @Excel(name = "条码前缀")
+    private String BarcodeHead;
+
+    public void setLineID(Long LineID) 
+    {
+        this.LineID = LineID;
+    }
+
+    public Long getLineID() 
+    {
+        return LineID;
+    }
+    public void setLineTypeName(String LineTypeName) 
+    {
+        this.LineTypeName = LineTypeName;
+    }
+
+    public String getLineTypeName() 
+    {
+        return LineTypeName;
+    }
+    public void setLineTypeFlag(String LineTypeFlag) 
+    {
+        this.LineTypeFlag = LineTypeFlag;
+    }
+
+    public String getLineTypeFlag() 
+    {
+        return LineTypeFlag;
+    }
+    public void setBarcodeHead(String BarcodeHead)
+    {
+        this.BarcodeHead = BarcodeHead;
+    }
+
+    public String getBarcodeHead()
+    {
+        return BarcodeHead;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("LineID", getLineID())
+            .append("LineTypeName", getLineTypeName())
+            .append("LineTypeFlag", getLineTypeFlag())
+            .append("BarcodeHead", getBarcodeHead())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdProductinfo.java

@@ -0,0 +1,318 @@
+package com.ruoyi.nanjing.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 产品信息对象 T_BD_ProductInfo
+ * 
+ * @author limy
+ * @date 2021-01-25
+ */
+public class TBdProductinfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long ID;
+
+    /** 机种ID */
+    @Excel(name = "机种ID")
+    private Long productID;
+
+    /** 机种类型 */
+    @Excel(name = "机种类型")
+    private String productName;
+
+    /** 产品代号 */
+    private String productCode;
+
+    /** 机种类型 */
+    @Excel(name = "机种类型")
+    private String productType;
+
+    /** 维护人 */
+    private String userID;
+
+    /** 制具车条码 */
+    @Excel(name = "制具车条码")
+    private String toolCarNo;
+
+    /** 供应商 */
+    private String supplier;
+
+    /** 零件号 */
+    private String partNum;
+
+    /** 软件版本 */
+    private String softVersion;
+
+    /** 生产地 */
+    private String yieldly;
+
+    /** 返修次数 */
+    private String returnCount;
+
+    /** 标签有无 */
+    @Excel(name = "标签有无")
+    private String machine;
+
+    /** 车间代号 */
+    private String ahopID;
+
+    /** 转向 */
+    private String turnTo;
+
+    /** 冷冻油 */
+    private String oil;
+
+    /** 制冷剂 */
+    private String freezing;
+
+    /** 转速 */
+    private String apeed;
+
+    /** 电压 */
+    private String volatage;
+
+    /** 公司名称 */
+    private String name;
+
+    /** 标签模板 */
+    @Excel(name = "标签模板")
+    private String template;
+
+    /** 标签形式 */
+    @Excel(name = "标签形式")
+    private String printType;
+
+    public void setID(Long ID) 
+    {
+        this.ID = ID;
+    }
+
+    public Long getID() 
+    {
+        return ID;
+    }
+    public void setProductID(Long productID) 
+    {
+        this.productID = productID;
+    }
+
+    public Long getProductID() 
+    {
+        return productID;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setProductCode(String productCode) 
+    {
+        this.productCode = productCode;
+    }
+
+    public String getProductCode() 
+    {
+        return productCode;
+    }
+    public void setProductType(String productType) 
+    {
+        this.productType = productType;
+    }
+
+    public String getProductType() 
+    {
+        return productType;
+    }
+    public void setUserID(String userID) 
+    {
+        this.userID = userID;
+    }
+
+    public String getUserID() 
+    {
+        return userID;
+    }
+    public void setToolCarNo(String toolCarNo) 
+    {
+        this.toolCarNo = toolCarNo;
+    }
+
+    public String getToolCarNo() 
+    {
+        return toolCarNo;
+    }
+    public void setSupplier(String supplier) 
+    {
+        this.supplier = supplier;
+    }
+
+    public String getSupplier() 
+    {
+        return supplier;
+    }
+    public void setPartNum(String partNum) 
+    {
+        this.partNum = partNum;
+    }
+
+    public String getPartNum() 
+    {
+        return partNum;
+    }
+    public void setSoftVersion(String softVersion) 
+    {
+        this.softVersion = softVersion;
+    }
+
+    public String getSoftVersion() 
+    {
+        return softVersion;
+    }
+    public void setYieldly(String yieldly) 
+    {
+        this.yieldly = yieldly;
+    }
+
+    public String getYieldly() 
+    {
+        return yieldly;
+    }
+    public void setReturnCount(String returnCount) 
+    {
+        this.returnCount = returnCount;
+    }
+
+    public String getReturnCount() 
+    {
+        return returnCount;
+    }
+    public void setMachine(String machine) 
+    {
+        this.machine = machine;
+    }
+
+    public String getMachine() 
+    {
+        return machine;
+    }
+    public void setAhopID(String ahopID) 
+    {
+        this.ahopID = ahopID;
+    }
+
+    public String getAhopID() 
+    {
+        return ahopID;
+    }
+    public void setTurnTo(String turnTo) 
+    {
+        this.turnTo = turnTo;
+    }
+
+    public String getTurnTo() 
+    {
+        return turnTo;
+    }
+    public void setOil(String oil) 
+    {
+        this.oil = oil;
+    }
+
+    public String getOil() 
+    {
+        return oil;
+    }
+    public void setFreezing(String freezing) 
+    {
+        this.freezing = freezing;
+    }
+
+    public String getFreezing() 
+    {
+        return freezing;
+    }
+    public void setApeed(String apeed) 
+    {
+        this.apeed = apeed;
+    }
+
+    public String getApeed() 
+    {
+        return apeed;
+    }
+    public void setVolatage(String volatage) 
+    {
+        this.volatage = volatage;
+    }
+
+    public String getVolatage() 
+    {
+        return volatage;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setTemplate(String template) 
+    {
+        this.template = template;
+    }
+
+    public String getTemplate() 
+    {
+        return template;
+    }
+    public void setPrintType(String printType) 
+    {
+        this.printType = printType;
+    }
+
+    public String getPrintType() 
+    {
+        return printType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ID", getID())
+            .append("productID", getProductID())
+            .append("productName", getProductName())
+            .append("productCode", getProductCode())
+            .append("productType", getProductType())
+            .append("userID", getUserID())
+            .append("updateTime", getUpdateTime())
+            .append("toolCarNo", getToolCarNo())
+            .append("supplier", getSupplier())
+            .append("partNum", getPartNum())
+            .append("softVersion", getSoftVersion())
+            .append("yieldly", getYieldly())
+            .append("returnCount", getReturnCount())
+            .append("machine", getMachine())
+            .append("ahopID", getAhopID())
+            .append("turnTo", getTurnTo())
+            .append("oil", getOil())
+            .append("freezing", getFreezing())
+            .append("apeed", getApeed())
+            .append("volatage", getVolatage())
+            .append("name", getName())
+            .append("template", getTemplate())
+            .append("printType", getPrintType())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdProducttype.java

@@ -0,0 +1,65 @@
+package com.ruoyi.nanjing.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 机种类型对象 T_BD_ProductType
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public class TBdProducttype extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long ID;
+
+    /** 机种id */
+    @Excel(name = "机种id")
+    private String ProductTypeID;
+
+    /** 机种名称 */
+    @Excel(name = "机种名称")
+    private String ProductTypeName;
+
+    public void setID(Long ID) 
+    {
+        this.ID = ID;
+    }
+
+    public Long getID() 
+    {
+        return ID;
+    }
+    public void setProductTypeID(String ProductTypeID) 
+    {
+        this.ProductTypeID = ProductTypeID;
+    }
+
+    public String getProductTypeID() 
+    {
+        return ProductTypeID;
+    }
+    public void setProductTypeName(String ProductTypeName)
+    {
+        this.ProductTypeName = ProductTypeName;
+    }
+
+    public String getProductTypeName()
+    {
+        return ProductTypeName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ID", getID())
+            .append("ProductTypeID", getProductTypeID())
+            .append("ProductTypeName", getProductTypeName())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdStationtype.java

@@ -0,0 +1,65 @@
+package com.ruoyi.nanjing.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工位类型对象 T_BD_StationType
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public class TBdStationtype extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long ID;
+
+    /** 类型名称 */
+    @Excel(name = "类型名称")
+    private String typeName;
+
+    /** 类型类别 */
+    @Excel(name = "类型类别")
+    private String typeClass;
+
+    public void setID(Long ID) 
+    {
+        this.ID = ID;
+    }
+
+    public Long getID() 
+    {
+        return ID;
+    }
+    public void setTypeName(String typeName) 
+    {
+        this.typeName = typeName;
+    }
+
+    public String getTypeName() 
+    {
+        return typeName;
+    }
+    public void setTypeClass(String typeClass) 
+    {
+        this.typeClass = typeClass;
+    }
+
+    public String getTypeClass() 
+    {
+        return typeClass;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ID", getID())
+            .append("typeName", getTypeName())
+            .append("typeClass", getTypeClass())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdSubstation.java

@@ -0,0 +1,403 @@
+package com.ruoyi.nanjing.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 工位管理对象 T_BD_SubStation
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public class TBdSubstation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long ID;
+
+    /** 工位id */
+//    @Excel(name = "工位id")
+    private Long StationID;
+
+    /** 工位代码 */
+    @Excel(name = "工位代码")
+    private String StationCode;
+
+    /** 工位类型 */
+    @Excel(name = "工位类型")
+    private Long StationType;
+
+    /** 机台id */
+//    @Excel(name = "机台id")
+    private String MachineID;
+
+    /** 连接id */
+//    @Excel(name = "连接id")
+    private Long UniteID;
+
+    /** 实际code */
+//    @Excel(name = "实际code")
+    private String CustomerCode;
+
+    /** 工位名称 */
+    @Excel(name = "工位名称")
+    private String StationName;
+
+    /** 父工位id */
+//    @Excel(name = "父工位id")
+    private String ParentStationID;
+
+    /** 父工位码 */
+//    @Excel(name = "父工位码")
+    private String ParentStationCode;
+
+    /** 父工位名 */
+//    @Excel(name = "父工位名")
+    private String ParentStationName;
+
+    /** 前工位id */
+//    @Excel(name = "前工位id")
+    private String PreStationID;
+
+    /** 前工位码 */
+//    @Excel(name = "前工位码")
+    private String PreStationCode;
+
+    /** 备注 */
+//    @Excel(name = "备注")
+    private String Reamark;
+
+    /** 用户id */
+//    @Excel(name = "用户id")
+    private String UserID;
+
+    /** 表名称 */
+//    @Excel(name = "表名称")
+    private String TableName;
+
+    /** 是否子工位 */
+//    @Excel(name = "是否子工位")
+    private String IsSemi;
+
+    /** 是否弃用工位 */
+//    @Excel(name = "是否弃用工位")
+    private String IsNGStation;
+
+    /** 数据 */
+//    @Excel(name = "数据")
+    private String HaveData;
+
+    /** 是否显示 */
+//    @Excel(name = "是否显示")
+    private String IsShow;
+
+    /** 是否有效，上位机使用该字段 */
+//    @Excel(name = "是否有效，上位机使用该字段")
+    private String UseFlag;
+
+    /** 参数个数 */
+    @Excel(name = "参数个数")
+    private Long paraCount;
+
+    /** 排序id */
+    @Excel(name = "排序id")
+    private Long OrderID;
+
+    /** 限制id */
+//    @Excel(name = "限制id")
+    private String LimitID;
+
+    /** 图片路径 */
+//    @Excel(name = "图片路径")
+    private String ImageUrl;
+
+    @Override
+    public Date getUpdateTime() {
+        return UpdateTime;
+    }
+
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        UpdateTime = updateTime;
+    }
+
+    /** 更新时间 */
+    private Date UpdateTime;
+
+    /** 线路id */
+    @Excel(name = "线路id")
+    private Long LineID;
+
+    public void setID(Long ID) 
+    {
+        this.ID = ID;
+    }
+
+    public Long getID() 
+    {
+        return ID;
+    }
+    public void setStationID(Long StationID) 
+    {
+        this.StationID = StationID;
+    }
+
+    public Long getStationID() 
+    {
+        return StationID;
+    }
+    public void setStationCode(String StationCode) 
+    {
+        this.StationCode = StationCode;
+    }
+
+    public String getStationCode() 
+    {
+        return StationCode;
+    }
+    public void setStationType(Long StationType) 
+    {
+        this.StationType = StationType;
+    }
+
+    public Long getStationType() 
+    {
+        return StationType;
+    }
+    public void setMachineID(String MachineID) 
+    {
+        this.MachineID = MachineID;
+    }
+
+    public String getMachineID() 
+    {
+        return MachineID;
+    }
+    public void setUniteID(Long UniteID) 
+    {
+        this.UniteID = UniteID;
+    }
+
+    public Long getUniteID() 
+    {
+        return UniteID;
+    }
+    public void setCustomerCode(String CustomerCode) 
+    {
+        this.CustomerCode = CustomerCode;
+    }
+
+    public String getCustomerCode() 
+    {
+        return CustomerCode;
+    }
+    public void setStationName(String StationName)
+    {
+        this.StationName = StationName;
+    }
+
+    public String getStationName()
+    {
+        return StationName;
+    }
+    public void setParentStationID(String ParentStationID) 
+    {
+        this.ParentStationID = ParentStationID;
+    }
+
+    public String getParentStationID() 
+    {
+        return ParentStationID;
+    }
+    public void setParentStationCode(String ParentStationCode) 
+    {
+        this.ParentStationCode = ParentStationCode;
+    }
+
+    public String getParentStationCode() 
+    {
+        return ParentStationCode;
+    }
+    public void setParentStationName(String ParentStationName)
+    {
+        this.ParentStationName = ParentStationName;
+    }
+
+    public String getParentStationName()
+    {
+        return ParentStationName;
+    }
+    public void setPreStationID(String PreStationID) 
+    {
+        this.PreStationID = PreStationID;
+    }
+
+    public String getPreStationID() 
+    {
+        return PreStationID;
+    }
+    public void setPreStationCode(String PreStationCode) 
+    {
+        this.PreStationCode = PreStationCode;
+    }
+
+    public String getPreStationCode() 
+    {
+        return PreStationCode;
+    }
+    public void setReamark(String Reamark)
+    {
+        this.Reamark = Reamark;
+    }
+
+    public String getReamark()
+    {
+        return Reamark;
+    }
+    public void setUserID(String UserID) 
+    {
+        this.UserID = UserID;
+    }
+
+    public String getUserID() 
+    {
+        return UserID;
+    }
+    public void setTableName(String TableName)
+    {
+        this.TableName = TableName;
+    }
+
+    public String getTableName()
+    {
+        return TableName;
+    }
+    public void setIsSemi(String IsSemi) 
+    {
+        this.IsSemi = IsSemi;
+    }
+
+    public String getIsSemi() 
+    {
+        return IsSemi;
+    }
+    public void setIsNGStation(String IsNGStation) 
+    {
+        this.IsNGStation = IsNGStation;
+    }
+
+    public String getIsNGStation() 
+    {
+        return IsNGStation;
+    }
+    public void setHaveData(String HaveData) 
+    {
+        this.HaveData = HaveData;
+    }
+
+    public String getHaveData() 
+    {
+        return HaveData;
+    }
+    public void setIsShow(String IsShow) 
+    {
+        this.IsShow = IsShow;
+    }
+
+    public String getIsShow() 
+    {
+        return IsShow;
+    }
+    public void setUseFlag(String UseFlag) 
+    {
+        this.UseFlag = UseFlag;
+    }
+
+    public String getUseFlag() 
+    {
+        return UseFlag;
+    }
+    public void setParaCount(Long paraCount) 
+    {
+        this.paraCount = paraCount;
+    }
+
+    public Long getParaCount() 
+    {
+        return paraCount;
+    }
+    public void setOrderID(Long OrderID) 
+    {
+        this.OrderID = OrderID;
+    }
+
+    public Long getOrderID() 
+    {
+        return OrderID;
+    }
+    public void setLimitID(String LimitID) 
+    {
+        this.LimitID = LimitID;
+    }
+
+    public String getLimitID() 
+    {
+        return LimitID;
+    }
+    public void setImageUrl(String ImageUrl)
+    {
+        this.ImageUrl = ImageUrl;
+    }
+
+    public String getImageUrl()
+    {
+        return ImageUrl;
+    }
+    public void setLineID(Long LineID) 
+    {
+        this.LineID = LineID;
+    }
+
+    public Long getLineID() 
+    {
+        return LineID;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ID", getID())
+            .append("StationID", getStationID())
+            .append("StationCode", getStationCode())
+            .append("StationType", getStationType())
+            .append("MachineID", getMachineID())
+            .append("UniteID", getUniteID())
+            .append("CustomerCode", getCustomerCode())
+            .append("StationName", getStationName())
+            .append("ParentStationID", getParentStationID())
+            .append("ParentStationCode", getParentStationCode())
+            .append("ParentStationName", getParentStationName())
+            .append("PreStationID", getPreStationID())
+            .append("PreStationCode", getPreStationCode())
+            .append("Reamark", getReamark())
+            .append("UserID", getUserID())
+            .append("UpdateTime", getUpdateTime())
+            .append("TableName", getTableName())
+            .append("IsSemi", getIsSemi())
+            .append("IsNGStation", getIsNGStation())
+            .append("HaveData", getHaveData())
+            .append("IsShow", getIsShow())
+            .append("UseFlag", getUseFlag())
+            .append("paraCount", getParaCount())
+            .append("OrderID", getOrderID())
+            .append("LimitID", getLimitID())
+            .append("ImageUrl", getImageUrl())
+            .append("LineID", getLineID())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpProductchangeinfo.java

@@ -0,0 +1,130 @@
+package com.ruoyi.nanjing.domain;
+
+import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 机种切换管理对象 T_RP_ProductChangeInfo
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public class TRpProductchangeinfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long ID;
+
+    /** 机种型号 */
+    @Excel(name = "机种型号")
+    private Long ProductId;
+
+    /** 生产负责人 */
+    @Excel(name = "生产负责人")
+    private String PersonInCharge;
+
+    /** 开始时间 */
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date BeginTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date EndTime;
+
+    public TBdProductinfo gettBdProductinfo() {
+        return tBdProductinfo;
+    }
+
+    public void settBdProductinfo(TBdProductinfo tBdProductinfo) {
+        this.tBdProductinfo = tBdProductinfo;
+    }
+
+    private TBdProductinfo tBdProductinfo;
+
+    /** 操作员 */
+    private String Operator;
+
+    /** 插入时间 */
+    private Date InsertTime;
+
+    public void setID(Long ID) 
+    {
+        this.ID = ID;
+    }
+
+    public Long getID() 
+    {
+        return ID;
+    }
+    public void setProductId(Long ProductId) 
+    {
+        this.ProductId = ProductId;
+    }
+
+    public Long getProductId() 
+    {
+        return ProductId;
+    }
+    public void setPersonInCharge(String PersonInCharge) 
+    {
+        this.PersonInCharge = PersonInCharge;
+    }
+
+    public String getPersonInCharge() 
+    {
+        return PersonInCharge;
+    }
+    public void setBeginTime(Date BeginTime) 
+    {
+        this.BeginTime = BeginTime;
+    }
+
+    public Date getBeginTime() 
+    {
+        return BeginTime;
+    }
+    public void setEndTime(Date EndTime) 
+    {
+        this.EndTime = EndTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return EndTime;
+    }
+    public void setOperator(String Operator) 
+    {
+        this.Operator = Operator;
+    }
+
+    public String getOperator() 
+    {
+        return Operator;
+    }
+    public void setInsertTime(Date InsertTime) 
+    {
+        this.InsertTime = InsertTime;
+    }
+
+    public Date getInsertTime() 
+    {
+        return InsertTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ID", getID())
+            .append("ProductId", getProductId())
+            .append("PersonInCharge", getPersonInCharge())
+            .append("BeginTime", getBeginTime())
+            .append("EndTime", getEndTime())
+            .append("Operator", getOperator())
+            .append("InsertTime", getInsertTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdLinetypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdLinetype;
+
+/**
+ * 主支线管理Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface TBdLinetypeMapper 
+{
+    /**
+     * 查询主支线管理
+     * 
+     * @param LineID 主支线管理ID
+     * @return 主支线管理
+     */
+    public TBdLinetype selectTBdLinetypeById(Long LineID);
+
+    /**
+     * 查询主支线管理列表
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 主支线管理集合
+     */
+    public List<TBdLinetype> selectTBdLinetypeList(TBdLinetype tBdLinetype);
+
+    /**
+     * 新增主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    public int insertTBdLinetype(TBdLinetype tBdLinetype);
+
+    /**
+     * 修改主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    public int updateTBdLinetype(TBdLinetype tBdLinetype);
+
+    /**
+     * 删除主支线管理
+     * 
+     * @param LineID 主支线管理ID
+     * @return 结果
+     */
+    public int deleteTBdLinetypeById(Long LineID);
+
+    /**
+     * 批量删除主支线管理
+     * 
+     * @param LineIDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdLinetypeByIds(String[] LineIDs);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProductinfoMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdProductinfo;
+
+/**
+ * 产品信息Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-25
+ */
+public interface TBdProductinfoMapper 
+{
+    /**
+     * 查询产品信息
+     * 
+     * @param ID 产品信息ID
+     * @return 产品信息
+     */
+    public TBdProductinfo selectTBdProductinfoById(Long ID);
+
+    /**
+     * 查询产品信息列表
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 产品信息集合
+     */
+    public List<TBdProductinfo> selectTBdProductinfoList(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 新增产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    public int insertTBdProductinfo(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 修改产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    public int updateTBdProductinfo(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 删除产品信息
+     * 
+     * @param ID 产品信息ID
+     * @return 结果
+     */
+    public int deleteTBdProductinfoById(Long ID);
+
+    /**
+     * 批量删除产品信息
+     * 
+     * @param IDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdProductinfoByIds(String[] IDs);
+
+    List<TBdProductinfo> selectTBdProductinfo();
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdProducttype;
+
+/**
+ * 机种类型Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface TBdProducttypeMapper 
+{
+    /**
+     * 查询机种类型
+     * 
+     * @param ID 机种类型ID
+     * @return 机种类型
+     */
+    public TBdProducttype selectTBdProducttypeById(Long ID);
+
+    /**
+     * 查询机种类型列表
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 机种类型集合
+     */
+    public List<TBdProducttype> selectTBdProducttypeList(TBdProducttype tBdProducttype);
+
+    /**
+     * 新增机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    public int insertTBdProducttype(TBdProducttype tBdProducttype);
+
+    /**
+     * 修改机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    public int updateTBdProducttype(TBdProducttype tBdProducttype);
+
+    /**
+     * 删除机种类型
+     * 
+     * @param ID 机种类型ID
+     * @return 结果
+     */
+    public int deleteTBdProducttypeById(Long ID);
+
+    /**
+     * 批量删除机种类型
+     * 
+     * @param IDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdProducttypeByIds(String[] IDs);
+
+    List<TBdProducttype> selectTBdProducttype();
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdStationtypeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdStationtype;
+
+/**
+ * 工位类型Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface TBdStationtypeMapper 
+{
+    /**
+     * 查询工位类型
+     * 
+     * @param ID 工位类型ID
+     * @return 工位类型
+     */
+    public TBdStationtype selectTBdStationtypeById(Long ID);
+
+    /**
+     * 查询工位类型列表
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 工位类型集合
+     */
+    public List<TBdStationtype> selectTBdStationtypeList(TBdStationtype tBdStationtype);
+
+    /**
+     * 新增工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    public int insertTBdStationtype(TBdStationtype tBdStationtype);
+
+    /**
+     * 修改工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    public int updateTBdStationtype(TBdStationtype tBdStationtype);
+
+    /**
+     * 删除工位类型
+     * 
+     * @param ID 工位类型ID
+     * @return 结果
+     */
+    public int deleteTBdStationtypeById(Long ID);
+
+    /**
+     * 批量删除工位类型
+     * 
+     * @param IDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdStationtypeByIds(String[] IDs);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdSubstationMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdSubstation;
+
+/**
+ * 工位管理Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface TBdSubstationMapper 
+{
+    /**
+     * 查询工位管理
+     * 
+     * @param ID 工位管理ID
+     * @return 工位管理
+     */
+    public TBdSubstation selectTBdSubstationById(Long ID);
+
+    /**
+     * 查询工位管理列表
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 工位管理集合
+     */
+    public List<TBdSubstation> selectTBdSubstationList(TBdSubstation tBdSubstation);
+
+    /**
+     * 新增工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    public int insertTBdSubstation(TBdSubstation tBdSubstation);
+
+    /**
+     * 修改工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    public int updateTBdSubstation(TBdSubstation tBdSubstation);
+
+    /**
+     * 删除工位管理
+     * 
+     * @param ID 工位管理ID
+     * @return 结果
+     */
+    public int deleteTBdSubstationById(Long ID);
+
+    /**
+     * 批量删除工位管理
+     * 
+     * @param IDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdSubstationByIds(String[] IDs);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpProductchangeinfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.mapper;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TRpProductchangeinfo;
+
+/**
+ * 机种切换管理Mapper接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface TRpProductchangeinfoMapper 
+{
+    /**
+     * 查询机种切换管理
+     * 
+     * @param ID 机种切换管理ID
+     * @return 机种切换管理
+     */
+    public TRpProductchangeinfo selectTRpProductchangeinfoById(Long ID);
+
+    /**
+     * 查询机种切换管理列表
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 机种切换管理集合
+     */
+    public List<TRpProductchangeinfo> selectTRpProductchangeinfoList(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 新增机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    public int insertTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 修改机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    public int updateTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 删除机种切换管理
+     * 
+     * @param ID 机种切换管理ID
+     * @return 结果
+     */
+    public int deleteTRpProductchangeinfoById(Long ID);
+
+    /**
+     * 批量删除机种切换管理
+     * 
+     * @param IDs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTRpProductchangeinfoByIds(String[] IDs);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdLinetypeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdLinetype;
+
+/**
+ * 主支线管理Service接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface ITBdLinetypeService 
+{
+    /**
+     * 查询主支线管理
+     * 
+     * @param LineID 主支线管理ID
+     * @return 主支线管理
+     */
+    public TBdLinetype selectTBdLinetypeById(Long LineID);
+
+    /**
+     * 查询主支线管理列表
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 主支线管理集合
+     */
+    public List<TBdLinetype> selectTBdLinetypeList(TBdLinetype tBdLinetype);
+
+    /**
+     * 新增主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    public int insertTBdLinetype(TBdLinetype tBdLinetype);
+
+    /**
+     * 修改主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    public int updateTBdLinetype(TBdLinetype tBdLinetype);
+
+    /**
+     * 批量删除主支线管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdLinetypeByIds(String ids);
+
+    /**
+     * 删除主支线管理信息
+     * 
+     * @param LineID 主支线管理ID
+     * @return 结果
+     */
+    public int deleteTBdLinetypeById(Long LineID);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProductinfoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdProductinfo;
+
+/**
+ * 产品信息Service接口
+ * 
+ * @author limy
+ * @date 2021-01-25
+ */
+public interface ITBdProductinfoService 
+{
+    /**
+     * 查询产品信息
+     * 
+     * @param ID 产品信息ID
+     * @return 产品信息
+     */
+    public TBdProductinfo selectTBdProductinfoById(Long ID);
+
+    /**
+     * 查询产品信息列表
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 产品信息集合
+     */
+    public List<TBdProductinfo> selectTBdProductinfoList(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 新增产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    public int insertTBdProductinfo(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 修改产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    public int updateTBdProductinfo(TBdProductinfo tBdProductinfo);
+
+    /**
+     * 批量删除产品信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdProductinfoByIds(String ids);
+
+    /**
+     * 删除产品信息信息
+     * 
+     * @param ID 产品信息ID
+     * @return 结果
+     */
+    public int deleteTBdProductinfoById(Long ID);
+
+    List<TBdProductinfo> selectTBdProductinfo();
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdProducttype;
+
+/**
+ * 机种类型Service接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface ITBdProducttypeService 
+{
+    /**
+     * 查询机种类型
+     * 
+     * @param ID 机种类型ID
+     * @return 机种类型
+     */
+    public TBdProducttype selectTBdProducttypeById(Long ID);
+
+    /**
+     * 查询机种类型列表
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 机种类型集合
+     */
+    public List<TBdProducttype> selectTBdProducttypeList(TBdProducttype tBdProducttype);
+
+    /**
+     * 新增机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    public int insertTBdProducttype(TBdProducttype tBdProducttype);
+
+    /**
+     * 修改机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    public int updateTBdProducttype(TBdProducttype tBdProducttype);
+
+    /**
+     * 批量删除机种类型
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdProducttypeByIds(String ids);
+
+    /**
+     * 删除机种类型信息
+     * 
+     * @param ID 机种类型ID
+     * @return 结果
+     */
+    public int deleteTBdProducttypeById(Long ID);
+
+//    查询最新添加的机种信息
+    List<TBdProducttype> selectTBdProducttype();
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdStationtypeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdStationtype;
+
+/**
+ * 工位类型Service接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface ITBdStationtypeService 
+{
+    /**
+     * 查询工位类型
+     * 
+     * @param ID 工位类型ID
+     * @return 工位类型
+     */
+    public TBdStationtype selectTBdStationtypeById(Long ID);
+
+    /**
+     * 查询工位类型列表
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 工位类型集合
+     */
+    public List<TBdStationtype> selectTBdStationtypeList(TBdStationtype tBdStationtype);
+
+    /**
+     * 新增工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    public int insertTBdStationtype(TBdStationtype tBdStationtype);
+
+    /**
+     * 修改工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    public int updateTBdStationtype(TBdStationtype tBdStationtype);
+
+    /**
+     * 批量删除工位类型
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdStationtypeByIds(String ids);
+
+    /**
+     * 删除工位类型信息
+     * 
+     * @param ID 工位类型ID
+     * @return 结果
+     */
+    public int deleteTBdStationtypeById(Long ID);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdSubstationService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TBdSubstation;
+
+/**
+ * 工位管理Service接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface ITBdSubstationService 
+{
+    /**
+     * 查询工位管理
+     * 
+     * @param ID 工位管理ID
+     * @return 工位管理
+     */
+    public TBdSubstation selectTBdSubstationById(Long ID);
+
+    /**
+     * 查询工位管理列表
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 工位管理集合
+     */
+    public List<TBdSubstation> selectTBdSubstationList(TBdSubstation tBdSubstation);
+
+    /**
+     * 新增工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    public int insertTBdSubstation(TBdSubstation tBdSubstation);
+
+    /**
+     * 修改工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    public int updateTBdSubstation(TBdSubstation tBdSubstation);
+
+    /**
+     * 批量删除工位管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBdSubstationByIds(String ids);
+
+    /**
+     * 删除工位管理信息
+     * 
+     * @param ID 工位管理ID
+     * @return 结果
+     */
+    public int deleteTBdSubstationById(Long ID);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpProductchangeinfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.nanjing.service;
+
+import java.util.List;
+import com.ruoyi.nanjing.domain.TRpProductchangeinfo;
+
+/**
+ * 机种切换管理Service接口
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+public interface ITRpProductchangeinfoService 
+{
+    /**
+     * 查询机种切换管理
+     * 
+     * @param ID 机种切换管理ID
+     * @return 机种切换管理
+     */
+    public TRpProductchangeinfo selectTRpProductchangeinfoById(Long ID);
+
+    /**
+     * 查询机种切换管理列表
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 机种切换管理集合
+     */
+    public List<TRpProductchangeinfo> selectTRpProductchangeinfoList(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 新增机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    public int insertTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 修改机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    public int updateTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo);
+
+    /**
+     * 批量删除机种切换管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTRpProductchangeinfoByIds(String ids);
+
+    /**
+     * 删除机种切换管理信息
+     * 
+     * @param ID 机种切换管理ID
+     * @return 结果
+     */
+    public int deleteTRpProductchangeinfoById(Long ID);
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdLinetypeServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TBdLinetypeMapper;
+import com.ruoyi.nanjing.domain.TBdLinetype;
+import com.ruoyi.nanjing.service.ITBdLinetypeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 主支线管理Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Service
+public class TBdLinetypeServiceImpl implements ITBdLinetypeService 
+{
+    @Autowired
+    private TBdLinetypeMapper tBdLinetypeMapper;
+
+    /**
+     * 查询主支线管理
+     * 
+     * @param LineID 主支线管理ID
+     * @return 主支线管理
+     */
+    @Override
+    public TBdLinetype selectTBdLinetypeById(Long LineID)
+    {
+        return tBdLinetypeMapper.selectTBdLinetypeById(LineID);
+    }
+
+    /**
+     * 查询主支线管理列表
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 主支线管理
+     */
+    @Override
+    public List<TBdLinetype> selectTBdLinetypeList(TBdLinetype tBdLinetype)
+    {
+        return tBdLinetypeMapper.selectTBdLinetypeList(tBdLinetype);
+    }
+
+    /**
+     * 新增主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBdLinetype(TBdLinetype tBdLinetype)
+    {
+        return tBdLinetypeMapper.insertTBdLinetype(tBdLinetype);
+    }
+
+    /**
+     * 修改主支线管理
+     * 
+     * @param tBdLinetype 主支线管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBdLinetype(TBdLinetype tBdLinetype)
+    {
+        return tBdLinetypeMapper.updateTBdLinetype(tBdLinetype);
+    }
+
+    /**
+     * 删除主支线管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdLinetypeByIds(String ids)
+    {
+        return tBdLinetypeMapper.deleteTBdLinetypeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除主支线管理信息
+     * 
+     * @param LineID 主支线管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdLinetypeById(Long LineID)
+    {
+        return tBdLinetypeMapper.deleteTBdLinetypeById(LineID);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProductinfoServiceImpl.java

@@ -0,0 +1,101 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TBdProductinfoMapper;
+import com.ruoyi.nanjing.domain.TBdProductinfo;
+import com.ruoyi.nanjing.service.ITBdProductinfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 产品信息Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-25
+ */
+@Service
+public class TBdProductinfoServiceImpl implements ITBdProductinfoService 
+{
+    @Autowired
+    private TBdProductinfoMapper tBdProductinfoMapper;
+
+    /**
+     * 查询产品信息
+     * 
+     * @param ID 产品信息ID
+     * @return 产品信息
+     */
+    @Override
+    public TBdProductinfo selectTBdProductinfoById(Long ID)
+    {
+        return tBdProductinfoMapper.selectTBdProductinfoById(ID);
+    }
+
+    /**
+     * 查询产品信息列表
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 产品信息
+     */
+    @Override
+    public List<TBdProductinfo> selectTBdProductinfoList(TBdProductinfo tBdProductinfo)
+    {
+        return tBdProductinfoMapper.selectTBdProductinfoList(tBdProductinfo);
+    }
+
+    /**
+     * 新增产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    @Override
+    public int insertTBdProductinfo(TBdProductinfo tBdProductinfo)
+    {
+        return tBdProductinfoMapper.insertTBdProductinfo(tBdProductinfo);
+    }
+
+    /**
+     * 修改产品信息
+     * 
+     * @param tBdProductinfo 产品信息
+     * @return 结果
+     */
+    @Override
+    public int updateTBdProductinfo(TBdProductinfo tBdProductinfo)
+    {
+        tBdProductinfo.setUpdateTime(DateUtils.getNowDate());
+        return tBdProductinfoMapper.updateTBdProductinfo(tBdProductinfo);
+    }
+
+    /**
+     * 删除产品信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdProductinfoByIds(String ids)
+    {
+        return tBdProductinfoMapper.deleteTBdProductinfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除产品信息信息
+     * 
+     * @param ID 产品信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdProductinfoById(Long ID)
+    {
+        return tBdProductinfoMapper.deleteTBdProductinfoById(ID);
+    }
+
+    @Override
+    public List<TBdProductinfo> selectTBdProductinfo() {
+        return tBdProductinfoMapper.selectTBdProductinfo();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TBdProducttypeMapper;
+import com.ruoyi.nanjing.domain.TBdProducttype;
+import com.ruoyi.nanjing.service.ITBdProducttypeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 机种类型Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Service
+public class TBdProducttypeServiceImpl implements ITBdProducttypeService 
+{
+    @Autowired
+    private TBdProducttypeMapper tBdProducttypeMapper;
+
+    /**
+     * 查询机种类型
+     * 
+     * @param ID 机种类型ID
+     * @return 机种类型
+     */
+    @Override
+    public TBdProducttype selectTBdProducttypeById(Long ID)
+    {
+        return tBdProducttypeMapper.selectTBdProducttypeById(ID);
+    }
+
+    /**
+     * 查询机种类型列表
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 机种类型
+     */
+    @Override
+    public List<TBdProducttype> selectTBdProducttypeList(TBdProducttype tBdProducttype)
+    {
+        return tBdProducttypeMapper.selectTBdProducttypeList(tBdProducttype);
+    }
+
+    /**
+     * 新增机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    @Override
+    public int insertTBdProducttype(TBdProducttype tBdProducttype)
+    {
+        return tBdProducttypeMapper.insertTBdProducttype(tBdProducttype);
+    }
+
+    /**
+     * 修改机种类型
+     * 
+     * @param tBdProducttype 机种类型
+     * @return 结果
+     */
+    @Override
+    public int updateTBdProducttype(TBdProducttype tBdProducttype)
+    {
+        return tBdProducttypeMapper.updateTBdProducttype(tBdProducttype);
+    }
+
+    /**
+     * 删除机种类型对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdProducttypeByIds(String ids)
+    {
+        return tBdProducttypeMapper.deleteTBdProducttypeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除机种类型信息
+     * 
+     * @param ID 机种类型ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdProducttypeById(Long ID)
+    {
+        return tBdProducttypeMapper.deleteTBdProducttypeById(ID);
+    }
+
+    @Override
+    public List<TBdProducttype> selectTBdProducttype() {
+        return tBdProducttypeMapper.selectTBdProducttype();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdStationtypeServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TBdStationtypeMapper;
+import com.ruoyi.nanjing.domain.TBdStationtype;
+import com.ruoyi.nanjing.service.ITBdStationtypeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 工位类型Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Service
+public class TBdStationtypeServiceImpl implements ITBdStationtypeService 
+{
+    @Autowired
+    private TBdStationtypeMapper tBdStationtypeMapper;
+
+    /**
+     * 查询工位类型
+     * 
+     * @param ID 工位类型ID
+     * @return 工位类型
+     */
+    @Override
+    public TBdStationtype selectTBdStationtypeById(Long ID)
+    {
+        return tBdStationtypeMapper.selectTBdStationtypeById(ID);
+    }
+
+    /**
+     * 查询工位类型列表
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 工位类型
+     */
+    @Override
+    public List<TBdStationtype> selectTBdStationtypeList(TBdStationtype tBdStationtype)
+    {
+        return tBdStationtypeMapper.selectTBdStationtypeList(tBdStationtype);
+    }
+
+    /**
+     * 新增工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    @Override
+    public int insertTBdStationtype(TBdStationtype tBdStationtype)
+    {
+        return tBdStationtypeMapper.insertTBdStationtype(tBdStationtype);
+    }
+
+    /**
+     * 修改工位类型
+     * 
+     * @param tBdStationtype 工位类型
+     * @return 结果
+     */
+    @Override
+    public int updateTBdStationtype(TBdStationtype tBdStationtype)
+    {
+        return tBdStationtypeMapper.updateTBdStationtype(tBdStationtype);
+    }
+
+    /**
+     * 删除工位类型对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdStationtypeByIds(String ids)
+    {
+        return tBdStationtypeMapper.deleteTBdStationtypeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除工位类型信息
+     * 
+     * @param ID 工位类型ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdStationtypeById(Long ID)
+    {
+        return tBdStationtypeMapper.deleteTBdStationtypeById(ID);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TBdSubstationMapper;
+import com.ruoyi.nanjing.domain.TBdSubstation;
+import com.ruoyi.nanjing.service.ITBdSubstationService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 工位管理Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Service
+public class TBdSubstationServiceImpl implements ITBdSubstationService 
+{
+    @Autowired
+    private TBdSubstationMapper tBdSubstationMapper;
+
+    /**
+     * 查询工位管理
+     * 
+     * @param ID 工位管理ID
+     * @return 工位管理
+     */
+    @Override
+    public TBdSubstation selectTBdSubstationById(Long ID)
+    {
+        return tBdSubstationMapper.selectTBdSubstationById(ID);
+    }
+
+    /**
+     * 查询工位管理列表
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 工位管理
+     */
+    @Override
+    public List<TBdSubstation> selectTBdSubstationList(TBdSubstation tBdSubstation)
+    {
+        return tBdSubstationMapper.selectTBdSubstationList(tBdSubstation);
+    }
+
+    /**
+     * 新增工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBdSubstation(TBdSubstation tBdSubstation)
+    {
+        return tBdSubstationMapper.insertTBdSubstation(tBdSubstation);
+    }
+
+    /**
+     * 修改工位管理
+     * 
+     * @param tBdSubstation 工位管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBdSubstation(TBdSubstation tBdSubstation)
+    {
+        return tBdSubstationMapper.updateTBdSubstation(tBdSubstation);
+    }
+
+    /**
+     * 删除工位管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdSubstationByIds(String ids)
+    {
+        return tBdSubstationMapper.deleteTBdSubstationByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除工位管理信息
+     * 
+     * @param ID 工位管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBdSubstationById(Long ID)
+    {
+        return tBdSubstationMapper.deleteTBdSubstationById(ID);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpProductchangeinfoServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.nanjing.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.nanjing.mapper.TRpProductchangeinfoMapper;
+import com.ruoyi.nanjing.domain.TRpProductchangeinfo;
+import com.ruoyi.nanjing.service.ITRpProductchangeinfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 机种切换管理Service业务层处理
+ * 
+ * @author limy
+ * @date 2021-01-22
+ */
+@Service
+public class TRpProductchangeinfoServiceImpl implements ITRpProductchangeinfoService 
+{
+    @Autowired
+    private TRpProductchangeinfoMapper tRpProductchangeinfoMapper;
+
+    /**
+     * 查询机种切换管理
+     * 
+     * @param ID 机种切换管理ID
+     * @return 机种切换管理
+     */
+    @Override
+    public TRpProductchangeinfo selectTRpProductchangeinfoById(Long ID)
+    {
+        return tRpProductchangeinfoMapper.selectTRpProductchangeinfoById(ID);
+    }
+
+    /**
+     * 查询机种切换管理列表
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 机种切换管理
+     */
+    @Override
+    public List<TRpProductchangeinfo> selectTRpProductchangeinfoList(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        return tRpProductchangeinfoMapper.selectTRpProductchangeinfoList(tRpProductchangeinfo);
+    }
+
+    /**
+     * 新增机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    @Override
+    public int insertTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        return tRpProductchangeinfoMapper.insertTRpProductchangeinfo(tRpProductchangeinfo);
+    }
+
+    /**
+     * 修改机种切换管理
+     * 
+     * @param tRpProductchangeinfo 机种切换管理
+     * @return 结果
+     */
+    @Override
+    public int updateTRpProductchangeinfo(TRpProductchangeinfo tRpProductchangeinfo)
+    {
+        return tRpProductchangeinfoMapper.updateTRpProductchangeinfo(tRpProductchangeinfo);
+    }
+
+    /**
+     * 删除机种切换管理对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRpProductchangeinfoByIds(String ids)
+    {
+        return tRpProductchangeinfoMapper.deleteTRpProductchangeinfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除机种切换管理信息
+     * 
+     * @param ID 机种切换管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRpProductchangeinfoById(Long ID)
+    {
+        return tRpProductchangeinfoMapper.deleteTRpProductchangeinfoById(ID);
+    }
+}

ruoyi-system/src/main/resources/mapper/nanjing/TBdLinetypeMapper.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TBdLinetypeMapper">
+
+    <resultMap type="TBdLinetype" id="TBdLinetypeResult">
+        <result property="LineID"    column="LineID"    />
+        <result property="LineTypeName"    column="LineTypeName"    />
+        <result property="LineTypeFlag"    column="LineTypeFlag"    />
+        <result property="BarcodeHead"    column="BarcodeHead"    />
+    </resultMap>
+
+    <sql id="selectTBdLinetypeVo">
+        select LineID, LineTypeName, LineTypeFlag, BarcodeHead from T_BD_LineType
+    </sql>
+
+    <select id="selectTBdLinetypeList" parameterType="TBdLinetype" resultMap="TBdLinetypeResult">
+        <include refid="selectTBdLinetypeVo"/>
+        <where>
+            <if test="LineTypeName != null  and LineTypeName != ''"> and LineTypeName like ('%' + #{LineTypeName} + '%')</if>
+            <if test="LineTypeFlag != null  and LineTypeFlag != ''"> and LineTypeFlag = #{LineTypeFlag}</if>
+        </where>
+        order by LineID desc
+    </select>
+
+    <select id="selectTBdLinetypeById" parameterType="Long" resultMap="TBdLinetypeResult">
+        <include refid="selectTBdLinetypeVo"/>
+        where LineID = #{LineID}
+    </select>
+
+    <insert id="insertTBdLinetype" parameterType="TBdLinetype">
+        insert into T_BD_LineType
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="LineID != null">LineID,</if>
+            <if test="LineTypeName != null">LineTypeName,</if>
+            <if test="LineTypeFlag != null">LineTypeFlag,</if>
+            <if test="BarcodeHead != null">BarcodeHead,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="LineID != null">#{LineID},</if>
+            <if test="LineTypeName != null">#{LineTypeName},</if>
+            <if test="LineTypeFlag != null">#{LineTypeFlag},</if>
+            <if test="BarcodeHead != null">#{BarcodeHead},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBdLinetype" parameterType="TBdLinetype">
+        update T_BD_LineType
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="LineTypeName != null">LineTypeName = #{LineTypeName},</if>
+            <if test="LineTypeFlag != null">LineTypeFlag = #{LineTypeFlag},</if>
+            <if test="BarcodeHead != null">BarcodeHead = #{BarcodeHead},</if>
+        </trim>
+        where LineID = #{LineID}
+    </update>
+
+    <delete id="deleteTBdLinetypeById" parameterType="Long">
+        delete from T_BD_LineType where LineID = #{LineID}
+    </delete>
+
+    <delete id="deleteTBdLinetypeByIds" parameterType="String">
+        delete from T_BD_LineType where LineID in
+        <foreach item="LineID" collection="array" open="(" separator="," close=")">
+            #{LineID}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/nanjing/TBdProductinfoMapper.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TBdProductinfoMapper">
+
+    <resultMap type="TBdProductinfo" id="TBdProductinfoResult">
+        <result property="ID"    column="ID"    />
+        <result property="productID"    column="ProductID"    />
+        <result property="productName"    column="ProductName"    />
+        <result property="productCode"    column="ProductCode"    />
+        <result property="productType"    column="ProductType"    />
+        <result property="userID"    column="UserID"    />
+        <result property="updateTime"    column="UpdateTime"    />
+        <result property="toolCarNo"    column="ToolCarNo"    />
+        <result property="supplier"    column="Supplier"    />
+        <result property="partNum"    column="partNum"    />
+        <result property="softVersion"    column="SoftVersion"    />
+        <result property="yieldly"    column="Yieldly"    />
+        <result property="returnCount"    column="ReturnCount"    />
+        <result property="machine"    column="Machine"    />
+        <result property="ahopID"    column="ShopID"    />
+        <result property="turnTo"    column="TurnTo"    />
+        <result property="oil"    column="Oil"    />
+        <result property="freezing"    column="Freezing"    />
+        <result property="apeed"    column="Speed"    />
+        <result property="volatage"    column="volatage"    />
+        <result property="name"    column="Name"    />
+        <result property="template"    column="Template"    />
+        <result property="printType"    column="PrintType"    />
+    </resultMap>
+
+    <sql id="selectTBdProductinfoVo">
+        select ID, ProductID, ProductName, ProductCode, ProductType, UserID, UpdateTime, ToolCarNo, Supplier, partNum, SoftVersion, Yieldly, ReturnCount, Machine, ShopID, TurnTo, Oil, Freezing, Speed, volatage, Name, Template, PrintType from T_BD_ProductInfo
+    </sql>
+
+    <select id="selectTBdProductinfo" resultMap="TBdProductinfoResult">
+        select top 1 ID, ProductID, ProductName, ProductCode, ProductType, UserID, UpdateTime, ToolCarNo, Supplier, partNum, SoftVersion, Yieldly, ReturnCount, Machine, ShopID, TurnTo, Oil, Freezing, Speed, volatage, Name, Template, PrintType from T_BD_ProductInfo
+        order by ProductID desc
+    </select>
+    <select id="selectTBdProductinfoList" parameterType="TBdProductinfo" resultMap="TBdProductinfoResult">
+        <include refid="selectTBdProductinfoVo"/>
+        <where>
+            <if test="productName != null  and productName != ''"> and ProductName like ('%' + #{productName} + '%')</if>
+            <if test="productType != null  and productType != ''"> and ProductType = #{productType}</if>
+            <if test="toolCarNo != null  and toolCarNo != ''"> and ToolCarNo = #{toolCarNo}</if>
+            <if test="machine != null  and machine != ''"> and Machine = #{machine}</if>
+            <if test="template != null  and template != ''"> and Template = #{template}</if>
+            <if test="printType != null  and printType != ''"> and PrintType = #{printType}</if>
+        </where>
+    </select>
+
+    <select id="selectTBdProductinfoById" parameterType="Long" resultMap="TBdProductinfoResult">
+        <include refid="selectTBdProductinfoVo"/>
+        where ID = #{ID}
+    </select>
+
+    <insert id="insertTBdProductinfo" parameterType="TBdProductinfo">
+        insert into T_BD_ProductInfo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">ID,</if>
+            <if test="productID != null">ProductID,</if>
+            <if test="productName != null">ProductName,</if>
+            <if test="productCode != null">ProductCode,</if>
+            <if test="productType != null">ProductType,</if>
+            <if test="userID != null">UserID,</if>
+            <if test="updateTime != null">UpdateTime,</if>
+            <if test="toolCarNo != null">ToolCarNo,</if>
+            <if test="supplier != null">Supplier,</if>
+            <if test="partNum != null">partNum,</if>
+            <if test="softVersion != null">SoftVersion,</if>
+            <if test="yieldly != null">Yieldly,</if>
+            <if test="returnCount != null">ReturnCount,</if>
+            <if test="machine != null">Machine,</if>
+            <if test="ahopID != null">ShopID,</if>
+            <if test="turnTo != null">TurnTo,</if>
+            <if test="oil != null">Oil,</if>
+            <if test="freezing != null">Freezing,</if>
+            <if test="apeed != null">Speed,</if>
+            <if test="volatage != null">volatage,</if>
+            <if test="name != null">Name,</if>
+            <if test="template != null">Template,</if>
+            <if test="printType != null">PrintType,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="productID != null">#{productID},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="productCode != null">#{productCode},</if>
+            <if test="productType != null">#{productType},</if>
+            <if test="userID != null">#{userID},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="toolCarNo != null">#{toolCarNo},</if>
+            <if test="supplier != null">#{supplier},</if>
+            <if test="partNum != null">#{partNum},</if>
+            <if test="softVersion != null">#{softVersion},</if>
+            <if test="yieldly != null">#{yieldly},</if>
+            <if test="returnCount != null">#{returnCount},</if>
+            <if test="machine != null">#{machine},</if>
+            <if test="ahopID != null">#{ahopID},</if>
+            <if test="turnTo != null">#{turnTo},</if>
+            <if test="oil != null">#{oil},</if>
+            <if test="freezing != null">#{freezing},</if>
+            <if test="apeed != null">#{apeed},</if>
+            <if test="volatage != null">#{volatage},</if>
+            <if test="name != null">#{name},</if>
+            <if test="template != null">#{template},</if>
+            <if test="printType != null">#{printType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBdProductinfo" parameterType="TBdProductinfo">
+        update T_BD_ProductInfo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productID != null">ProductID = #{productID},</if>
+            <if test="productName != null">ProductName = #{productName},</if>
+            <if test="productCode != null">ProductCode = #{productCode},</if>
+            <if test="productType != null">ProductType = #{productType},</if>
+            <if test="userID != null">UserID = #{userID},</if>
+            <if test="updateTime != null">UpdateTime = #{updateTime},</if>
+            <if test="toolCarNo != null">ToolCarNo = #{toolCarNo},</if>
+            <if test="supplier != null">Supplier = #{supplier},</if>
+            <if test="partNum != null">partNum = #{partNum},</if>
+            <if test="softVersion != null">SoftVersion = #{softVersion},</if>
+            <if test="yieldly != null">Yieldly = #{yieldly},</if>
+            <if test="returnCount != null">ReturnCount = #{returnCount},</if>
+            <if test="machine != null">Machine = #{machine},</if>
+            <if test="ahopID != null">ShopID = #{ahopID},</if>
+            <if test="turnTo != null">TurnTo = #{turnTo},</if>
+            <if test="oil != null">Oil = #{oil},</if>
+            <if test="freezing != null">Freezing = #{freezing},</if>
+            <if test="apeed != null">Speed = #{apeed},</if>
+            <if test="volatage != null">volatage = #{volatage},</if>
+            <if test="name != null">Name = #{name},</if>
+            <if test="template != null">Template = #{template},</if>
+            <if test="printType != null">PrintType = #{printType},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTBdProductinfoById" parameterType="Long">
+        delete from T_BD_ProductInfo where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTBdProductinfoByIds" parameterType="String">
+        delete from T_BD_ProductInfo where ID in
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TBdProducttypeMapper">
+
+    <resultMap type="TBdProducttype" id="TBdProducttypeResult">
+        <result property="ID"    column="ID"    />
+        <result property="ProductTypeID"    column="ProductTypeID"    />
+        <result property="ProductTypeName"    column="ProductTypeName"    />
+    </resultMap>
+
+    <sql id="selectTBdProducttypeVo">
+        select ID, ProductTypeID, ProductTypeName from T_BD_ProductType
+    </sql>
+
+    <select id="selectTBdProducttype" resultMap="TBdProducttypeResult">
+        select top 1 ID, ProductTypeID, ProductTypeName from T_BD_ProductType
+        order by ProductTypeID desc
+    </select>
+    <select id="selectTBdProducttypeList" parameterType="TBdProducttype" resultMap="TBdProducttypeResult">
+        <include refid="selectTBdProducttypeVo"/>
+        <where>
+            <if test="ProductTypeName != null "> and ProductTypeName like ('%' + #{ProductTypeName} + '%')</if>
+        </where>
+    </select>
+
+    <select id="selectTBdProducttypeById" parameterType="Long" resultMap="TBdProducttypeResult">
+        <include refid="selectTBdProducttypeVo"/>
+        where ID = #{ID}
+    </select>
+
+    <insert id="insertTBdProducttype" parameterType="TBdProducttype">
+        insert into T_BD_ProductType
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">ID,</if>
+            <if test="ProductTypeID != null">ProductTypeID,</if>
+            <if test="ProductTypeName != null">ProductTypeName,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="ProductTypeID != null">#{ProductTypeID},</if>
+            <if test="ProductTypeName != null">#{ProductTypeName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBdProducttype" parameterType="TBdProducttype">
+        update T_BD_ProductType
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ProductTypeID != null">ProductTypeID = #{ProductTypeID},</if>
+            <if test="ProductTypeName != null">ProductTypeName = #{ProductTypeName},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTBdProducttypeById" parameterType="Long">
+        delete from T_BD_ProductType where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTBdProducttypeByIds" parameterType="String">
+        delete from T_BD_ProductType where ID in
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/nanjing/TBdStationtypeMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TBdStationtypeMapper">
+
+    <resultMap type="TBdStationtype" id="TBdStationtypeResult">
+        <result property="ID"    column="ID"    />
+        <result property="typeName"    column="Type_Name"    />
+        <result property="typeClass"    column="Type_Class"    />
+    </resultMap>
+
+    <sql id="selectTBdStationtypeVo">
+        select ID, Type_Name, Type_Class from T_BD_StationType
+    </sql>
+
+    <select id="selectTBdStationtypeList" parameterType="TBdStationtype" resultMap="TBdStationtypeResult">
+        <include refid="selectTBdStationtypeVo"/>
+        <where>
+            <if test="typeName != null  and typeName != ''"> and Type_Name like ('%' + #{typeName} + '%')</if>
+        </where>
+    </select>
+
+    <select id="selectTBdStationtypeById" parameterType="Long" resultMap="TBdStationtypeResult">
+        <include refid="selectTBdStationtypeVo"/>
+        where ID = #{ID}
+    </select>
+
+    <insert id="insertTBdStationtype" parameterType="TBdStationtype">
+        insert into T_BD_StationType
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">ID,</if>
+            <if test="typeName != null">Type_Name,</if>
+            <if test="typeClass != null">Type_Class,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="typeName != null">#{typeName},</if>
+            <if test="typeClass != null">#{typeClass},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBdStationtype" parameterType="TBdStationtype">
+        update T_BD_StationType
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="typeName != null">Type_Name = #{typeName},</if>
+            <if test="typeClass != null">Type_Class = #{typeClass},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTBdStationtypeById" parameterType="Long">
+        delete from T_BD_StationType where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTBdStationtypeByIds" parameterType="String">
+        delete from T_BD_StationType where ID in
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/nanjing/TBdSubstationMapper.xml

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TBdSubstationMapper">
+
+    <resultMap type="TBdSubstation" id="TBdSubstationResult">
+        <result property="ID"    column="ID"    />
+        <result property="StationID"    column="StationID"    />
+        <result property="StationCode"    column="StationCode"    />
+        <result property="StationType"    column="StationType"    />
+        <result property="MachineID"    column="MachineID"    />
+        <result property="UniteID"    column="UniteID"    />
+        <result property="CustomerCode"    column="CustomerCode"    />
+        <result property="StationName"    column="StationName"    />
+        <result property="ParentStationID"    column="ParentStationID"    />
+        <result property="ParentStationCode"    column="ParentStationCode"    />
+        <result property="ParentStationName"    column="ParentStationName"    />
+        <result property="PreStationID"    column="PreStationID"    />
+        <result property="PreStationCode"    column="PreStationCode"    />
+        <result property="Reamark"    column="Reamark"    />
+        <result property="UserID"    column="UserID"    />
+        <result property="UpdateTime"    column="UpdateTime"    />
+        <result property="TableName"    column="TableName"    />
+        <result property="IsSemi"    column="IsSemi"    />
+        <result property="IsNGStation"    column="IsNGStation"    />
+        <result property="HaveData"    column="HaveData"    />
+        <result property="IsShow"    column="IsShow"    />
+        <result property="UseFlag"    column="UseFlag"    />
+        <result property="paraCount"    column="paraCount"    />
+        <result property="OrderID"    column="OrderID"    />
+        <result property="LimitID"    column="LimitID"    />
+        <result property="ImageUrl"    column="ImageUrl"    />
+        <result property="LineID"    column="LineID"    />
+    </resultMap>
+
+    <sql id="selectTBdSubstationVo">
+        select ID, StationID, StationCode, StationType, MachineID, UniteID, CustomerCode, StationName, ParentStationID, ParentStationCode, ParentStationName, PreStationID, PreStationCode, Reamark, UserID, UpdateTime, TableName, IsSemi, IsNGStation, HaveData, IsShow, UseFlag, paraCount, OrderID, LimitID, ImageUrl, LineID from T_BD_SubStation
+    </sql>
+
+    <select id="selectTBdSubstationList" parameterType="TBdSubstation" resultMap="TBdSubstationResult">
+        <include refid="selectTBdSubstationVo"/>
+        <where>
+            <if test="StationID != null "> and StationID = #{StationID}</if>
+            <if test="StationCode != null  and StationCode != ''"> and StationCode = #{StationCode}</if>
+            <if test="StationType != null "> and StationType = #{StationType}</if>
+            <if test="MachineID != null  and MachineID != ''"> and MachineID = #{MachineID}</if>
+            <if test="UniteID != null "> and UniteID = #{UniteID}</if>
+            <if test="CustomerCode != null  and CustomerCode != ''"> and CustomerCode = #{CustomerCode}</if>
+            <if test="StationName != null "> and StationName like ('%' + #{StationName} + '%')</if>
+            <if test="ParentStationID != null  and ParentStationID != ''"> and ParentStationID = #{ParentStationID}</if>
+            <if test="ParentStationCode != null  and ParentStationCode != ''"> and ParentStationCode = #{ParentStationCode}</if>
+            <if test="ParentStationName != null "> and ParentStationName like ('%' + #{ParentStationName} + '%')</if>
+            <if test="PreStationID != null  and PreStationID != ''"> and PreStationID = #{PreStationID}</if>
+            <if test="PreStationCode != null  and PreStationCode != ''"> and PreStationCode = #{PreStationCode}</if>
+            <if test="Reamark != null "> and Reamark = #{Reamark}</if>
+            <if test="UserID != null  and UserID != ''"> and UserID = #{UserID}</if>
+            <if test="UpdateTime != null "> and UpdateTime = #{UpdateTime}</if>
+            <if test="TableName != null "> and TableName like ('%' + #{TableName} + '%')</if>
+            <if test="IsSemi != null  and IsSemi != ''"> and IsSemi = #{IsSemi}</if>
+            <if test="IsNGStation != null  and IsNGStation != ''"> and IsNGStation = #{IsNGStation}</if>
+            <if test="HaveData != null  and HaveData != ''"> and HaveData = #{HaveData}</if>
+            <if test="IsShow != null  and IsShow != ''"> and IsShow = #{IsShow}</if>
+            <if test="UseFlag != null  and UseFlag != ''"> and UseFlag = #{UseFlag}</if>
+            <if test="paraCount != null "> and paraCount = #{paraCount}</if>
+            <if test="OrderID != null "> and OrderID = #{OrderID}</if>
+            <if test="LimitID != null  and LimitID != ''"> and LimitID = #{LimitID}</if>
+            <if test="ImageUrl != null "> and ImageUrl = #{ImageUrl}</if>
+            <if test="LineID != null "> and LineID = #{LineID}</if>
+        </where>
+    </select>
+
+    <select id="selectTBdSubstationById" parameterType="Long" resultMap="TBdSubstationResult">
+        <include refid="selectTBdSubstationVo"/>
+        where ID = #{ID}
+    </select>
+
+    <insert id="insertTBdSubstation" parameterType="TBdSubstation">
+        insert into T_BD_SubStation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">ID,</if>
+            <if test="StationID != null">StationID,</if>
+            <if test="StationCode != null">StationCode,</if>
+            <if test="StationType != null">StationType,</if>
+            <if test="MachineID != null">MachineID,</if>
+            <if test="UniteID != null">UniteID,</if>
+            <if test="CustomerCode != null">CustomerCode,</if>
+            <if test="StationName != null">StationName,</if>
+            <if test="ParentStationID != null">ParentStationID,</if>
+            <if test="ParentStationCode != null">ParentStationCode,</if>
+            <if test="ParentStationName != null">ParentStationName,</if>
+            <if test="PreStationID != null">PreStationID,</if>
+            <if test="PreStationCode != null">PreStationCode,</if>
+            <if test="Reamark != null">Reamark,</if>
+            <if test="UserID != null">UserID,</if>
+            <if test="UpdateTime != null">UpdateTime,</if>
+            <if test="TableName != null">TableName,</if>
+            <if test="IsSemi != null">IsSemi,</if>
+            <if test="IsNGStation != null">IsNGStation,</if>
+            <if test="HaveData != null">HaveData,</if>
+            <if test="IsShow != null">IsShow,</if>
+            <if test="UseFlag != null">UseFlag,</if>
+            <if test="paraCount != null">paraCount,</if>
+            <if test="OrderID != null">OrderID,</if>
+            <if test="LimitID != null">LimitID,</if>
+            <if test="ImageUrl != null">ImageUrl,</if>
+            <if test="LineID != null">LineID,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="StationID != null">#{StationID},</if>
+            <if test="StationCode != null">#{StationCode},</if>
+            <if test="StationType != null">#{StationType},</if>
+            <if test="MachineID != null">#{MachineID},</if>
+            <if test="UniteID != null">#{UniteID},</if>
+            <if test="CustomerCode != null">#{CustomerCode},</if>
+            <if test="StationName != null">#{StationName},</if>
+            <if test="ParentStationID != null">#{ParentStationID},</if>
+            <if test="ParentStationCode != null">#{ParentStationCode},</if>
+            <if test="ParentStationName != null">#{ParentStationName},</if>
+            <if test="PreStationID != null">#{PreStationID},</if>
+            <if test="PreStationCode != null">#{PreStationCode},</if>
+            <if test="Reamark != null">#{Reamark},</if>
+            <if test="UserID != null">#{UserID},</if>
+            <if test="UpdateTime != null">#{UpdateTime},</if>
+            <if test="TableName != null">#{TableName},</if>
+            <if test="IsSemi != null">#{IsSemi},</if>
+            <if test="IsNGStation != null">#{IsNGStation},</if>
+            <if test="HaveData != null">#{HaveData},</if>
+            <if test="IsShow != null">#{IsShow},</if>
+            <if test="UseFlag != null">#{UseFlag},</if>
+            <if test="paraCount != null">#{paraCount},</if>
+            <if test="OrderID != null">#{OrderID},</if>
+            <if test="LimitID != null">#{LimitID},</if>
+            <if test="ImageUrl != null">#{ImageUrl},</if>
+            <if test="LineID != null">#{LineID},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBdSubstation" parameterType="TBdSubstation">
+        update T_BD_SubStation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="StationID != null">StationID = #{StationID},</if>
+            <if test="StationCode != null">StationCode = #{StationCode},</if>
+            <if test="StationType != null">StationType = #{StationType},</if>
+            <if test="MachineID != null">MachineID = #{MachineID},</if>
+            <if test="UniteID != null">UniteID = #{UniteID},</if>
+            <if test="CustomerCode != null">CustomerCode = #{CustomerCode},</if>
+            <if test="StationName != null">StationName = #{StationName},</if>
+            <if test="ParentStationID != null">ParentStationID = #{ParentStationID},</if>
+            <if test="ParentStationCode != null">ParentStationCode = #{ParentStationCode},</if>
+            <if test="ParentStationName != null">ParentStationName = #{ParentStationName},</if>
+            <if test="PreStationID != null">PreStationID = #{PreStationID},</if>
+            <if test="PreStationCode != null">PreStationCode = #{PreStationCode},</if>
+            <if test="Reamark != null">Reamark = #{Reamark},</if>
+            <if test="UserID != null">UserID = #{UserID},</if>
+            <if test="UpdateTime != null">UpdateTime = #{UpdateTime},</if>
+            <if test="TableName != null">TableName = #{TableName},</if>
+            <if test="IsSemi != null">IsSemi = #{IsSemi},</if>
+            <if test="IsNGStation != null">IsNGStation = #{IsNGStation},</if>
+            <if test="HaveData != null">HaveData = #{HaveData},</if>
+            <if test="IsShow != null">IsShow = #{IsShow},</if>
+            <if test="UseFlag != null">UseFlag = #{UseFlag},</if>
+            <if test="paraCount != null">paraCount = #{paraCount},</if>
+            <if test="OrderID != null">OrderID = #{OrderID},</if>
+            <if test="LimitID != null">LimitID = #{LimitID},</if>
+            <if test="ImageUrl != null">ImageUrl = #{ImageUrl},</if>
+            <if test="LineID != null">LineID = #{LineID},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTBdSubstationById" parameterType="Long">
+        delete from T_BD_SubStation where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTBdSubstationByIds" parameterType="String">
+        delete from T_BD_SubStation where ID in
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/nanjing/TRpProductchangeinfoMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.nanjing.mapper.TRpProductchangeinfoMapper">
+
+    <resultMap type="TRpProductchangeinfo" id="TRpProductchangeinfoResult">
+        <result property="ID"    column="ID"    />
+        <result property="ProductId"    column="ProductId"    />
+        <result property="PersonInCharge"    column="PersonInCharge"    />
+        <result property="BeginTime"    column="BeginTime"    />
+        <result property="EndTime"    column="EndTime"    />
+        <result property="Operator"    column="Operator"    />
+        <result property="InsertTime"    column="InsertTime"    />
+        <association property="tBdProductinfo" column="productName" javaType="com.ruoyi.nanjing.domain.TBdProductinfo" resultMap="prodName"/>
+    </resultMap>
+
+    <resultMap id="prodName" type="com.ruoyi.nanjing.domain.TBdProductinfo">
+        <result property="productName" column="ProductName"></result>
+    </resultMap>
+    <sql id="selectTRpProductchangeinfoVo">
+        select t1.ID, t1.ProductId,t2.ProductName, t1.PersonInCharge, t1.BeginTime, t1.EndTime, t1.Operator, t1.InsertTime from T_RP_ProductChangeInfo t1
+        left join T_BD_ProductInfo t2 on t1.ProductId = t2.ProductID
+    </sql>
+
+    <select id="selectTRpProductchangeinfoList" parameterType="TRpProductchangeinfo" resultMap="TRpProductchangeinfoResult">
+        <include refid="selectTRpProductchangeinfoVo"/>
+        <where>
+            <if test="ProductId != null "> and t1.ProductId = #{ProductId}</if>
+            <if test="PersonInCharge != null  and PersonInCharge != ''"> and t1.PersonInCharge like ('%' + #{PersonInCharge} + '%')</if>
+            and t1.BeginTime is null
+            or t1.EndTime is null
+        </where>
+    </select>
+
+    <select id="selectTRpProductchangeinfoById" parameterType="Long" resultMap="TRpProductchangeinfoResult">
+        <include refid="selectTRpProductchangeinfoVo"/>
+        where t1.ID = #{ID}
+    </select>
+
+    <insert id="insertTRpProductchangeinfo" parameterType="TRpProductchangeinfo">
+        insert into T_RP_ProductChangeInfo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ID != null">ID,</if>
+            <if test="ProductId != null">ProductId,</if>
+            <if test="PersonInCharge != null">PersonInCharge,</if>
+            <if test="BeginTime != null">BeginTime,</if>
+            <if test="EndTime != null">EndTime,</if>
+            <if test="Operator != null">Operator,</if>
+            <if test="InsertTime != null">InsertTime,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ID != null">#{ID},</if>
+            <if test="ProductId != null">#{ProductId},</if>
+            <if test="PersonInCharge != null">#{PersonInCharge},</if>
+            <if test="BeginTime != null">#{BeginTime},</if>
+            <if test="EndTime != null">#{EndTime},</if>
+            <if test="Operator != null">#{Operator},</if>
+            <if test="InsertTime != null">#{InsertTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTRpProductchangeinfo" parameterType="TRpProductchangeinfo">
+        update T_RP_ProductChangeInfo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ProductId != null">ProductId = #{ProductId},</if>
+            <if test="PersonInCharge != null">PersonInCharge = #{PersonInCharge},</if>
+            <if test="BeginTime != null">BeginTime = #{BeginTime},</if>
+            <if test="EndTime != null">EndTime = #{EndTime},</if>
+            <if test="Operator != null">Operator = #{Operator},</if>
+            <if test="InsertTime != null">InsertTime = #{InsertTime},</if>
+        </trim>
+        where ID = #{ID}
+    </update>
+
+    <delete id="deleteTRpProductchangeinfoById" parameterType="Long">
+        delete from T_RP_ProductChangeInfo where ID = #{ID}
+    </delete>
+
+    <delete id="deleteTRpProductchangeinfoByIds" parameterType="String">
+        delete from T_RP_ProductChangeInfo where ID in
+        <foreach item="ID" collection="array" open="(" separator="," close=")">
+            #{ID}
+        </foreach>
+    </delete>
+
+</mapper>