From 0edc9cd23d8787f93fe52afac0577e327f67cbbe Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期五, 11 四月 2025 08:59:06 +0800
Subject: [PATCH] 工艺路线后端，和其他部分代码优化
---
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteTempMapper.java | 63 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteTempController.java | 91 +++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java | 235 +++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanTempServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java | 140 +++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java | 220 ++++++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java | 3
aps-modules/aps-system/src/main/resources/bootstrap.yml | 4
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml | 126 +++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml | 131 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteTempService.java | 61 ++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteMapper.java | 63 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java | 128 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteService.java | 64 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteTempServiceImpl.java | 98 +++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 2
22 files changed, 1,441 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
new file mode 100644
index 0000000..88aa68c
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
@@ -0,0 +1,140 @@
+package com.aps.core.controller.basicData;
+
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.log.annotation.Log;
+import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.core.domain.ApsProcessRoute;
+import com.aps.core.domain.ApsProcessRouteTemp;
+import com.aps.core.service.IApsProcessRouteService;
+import com.aps.core.service.IApsProcessRouteTempService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 宸ヨ壓璺嚎Controller
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@RestController
+@RequestMapping("/processRoute")
+public class ApsProcessRouteController extends BaseController
+{
+ @Autowired
+ private IApsProcessRouteService apsProcessRouteService;
+ @Autowired
+ private IApsProcessRouteTempService apsProcessRouteTempService;
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ */
+ @RequiresPermissions("processRoute:processRoute:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsProcessRoute apsProcessRoute)
+ {
+// startPage();
+ List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭宸ヨ壓璺嚎鍒楄〃
+ */
+ @RequiresPermissions("processRoute:processRoute:export")
+ @Log(title = "宸ヨ壓璺嚎", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsProcessRoute apsProcessRoute)
+ {
+ List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
+ ExcelUtil<ApsProcessRoute> util = new ExcelUtil<ApsProcessRoute>(ApsProcessRoute.class);
+ util.exportExcel(response, list, "宸ヨ壓璺嚎鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇宸ヨ壓璺嚎璇︾粏淇℃伅
+ */
+ @RequiresPermissions("processRoute:processRoute:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(apsProcessRouteService.selectApsProcessRouteById(id));
+ }
+
+ /**
+ * 鏂板宸ヨ壓璺嚎
+ */
+ @RequiresPermissions("processRoute:processRoute:add")
+ @Log(title = "宸ヨ壓璺嚎", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsProcessRoute apsProcessRoute)
+ {
+ return toAjax(apsProcessRouteService.insertApsProcessRoute(apsProcessRoute));
+ }
+
+ /**
+ * 淇敼宸ヨ壓璺嚎
+ */
+ @RequiresPermissions("processRoute:processRoute:edit")
+ @Log(title = "宸ヨ壓璺嚎", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsProcessRoute apsProcessRoute)
+ {
+ return toAjax(apsProcessRouteService.updateApsProcessRoute(apsProcessRoute));
+ }
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎
+ */
+ @RequiresPermissions("processRoute:processRoute:remove")
+ @Log(title = "宸ヨ壓璺嚎", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(apsProcessRouteService.deleteApsProcessRouteByIds(ids));
+ }
+
+ /**
+ * 宸ヨ壓璺嚎瀵煎叆
+ */
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
+ List<ApsProcessRouteTemp> apsProcessRouteTemps = util.importExcel(file.getInputStream());
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (apsProcessRouteTemps.size() > 0) {
+ String batchNum= IdUtils.fastUUID();
+ for (int i = 0; i < apsProcessRouteTemps.size(); i++) {
+ apsProcessRouteTemps.get(i).setId(IdUtils.fastUUID());
+ //鎻掑叆鐗堟湰鍙�
+ apsProcessRouteTemps.get(i).setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
+ apsProcessRouteTempService.insertApsProcessRouteTemp(apsProcessRouteTemps.get(i));
+ }
+
+ return AjaxResult.success("瀵煎叆鎴愬姛",batchNum);
+ } else {
+ return AjaxResult.error("妯℃澘鍐呭涓虹┖");
+ }
+ }
+ /***
+ * @Description: 纭涓婁紶
+ * @Param: [apsProcessRouteTemp]
+ * @return: com.aps.common.core.web.domain.AjaxResult
+ * @Author: wwj
+ * @Date: 2025/4/9
+ */
+ @PostMapping("/confirmProcessRoute")
+ public AjaxResult confirmProcessRoute(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
+ return toAjax(apsProcessRouteService.confirmProcessRoute(apsProcessRouteTemp));
+ }
+
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteTempController.java
new file mode 100644
index 0000000..6554e00
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteTempController.java
@@ -0,0 +1,91 @@
+package com.aps.core.controller.basicData;
+
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.common.log.annotation.Log;
+import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.core.domain.ApsProcessRouteTemp;
+import com.aps.core.service.IApsProcessRouteTempService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 宸ヨ壓璺嚎-涓存椂Controller
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@RestController
+@RequestMapping("/processRouteTemp")
+public class ApsProcessRouteTempController extends BaseController {
+ @Autowired
+ private IApsProcessRouteTempService apsProcessRouteTempService;
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂鍒楄〃
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsProcessRouteTemp apsProcessRouteTemp) {
+// startPage();
+ List<ApsProcessRouteTemp> list = apsProcessRouteTempService.selectApsProcessRouteTempList(apsProcessRouteTemp);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭宸ヨ壓璺嚎-涓存椂鍒楄〃
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:export")
+ @Log(title = "宸ヨ壓璺嚎-涓存椂", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsProcessRouteTemp apsProcessRouteTemp) {
+ List<ApsProcessRouteTemp> list = apsProcessRouteTempService.selectApsProcessRouteTempList(apsProcessRouteTemp);
+ ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
+ util.exportExcel(response, list, "宸ヨ壓璺嚎-涓存椂鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇宸ヨ壓璺嚎-涓存椂璇︾粏淇℃伅
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return success(apsProcessRouteTempService.selectApsProcessRouteTempById(id));
+ }
+
+ /**
+ * 鏂板宸ヨ壓璺嚎-涓存椂
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:add")
+ @Log(title = "宸ヨ壓璺嚎-涓存椂", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
+ return toAjax(apsProcessRouteTempService.insertApsProcessRouteTemp(apsProcessRouteTemp));
+ }
+
+ /**
+ * 淇敼宸ヨ壓璺嚎-涓存椂
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:edit")
+ @Log(title = "宸ヨ壓璺嚎-涓存椂", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
+ return toAjax(apsProcessRouteTempService.updateApsProcessRouteTemp(apsProcessRouteTemp));
+ }
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎-涓存椂
+ */
+ @RequiresPermissions("processRouteTemp:processRouteTemp:remove")
+ @Log(title = "宸ヨ壓璺嚎-涓存椂", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
+ return toAjax(apsProcessRouteTempService.deleteApsProcessRouteTempByIds(ids));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
new file mode 100644
index 0000000..2287c9b
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
@@ -0,0 +1,220 @@
+package com.aps.core.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
+
+/**
+ * 宸ヨ壓璺嚎瀵硅薄 aps_process_route
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+public class ApsProcessRoute extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private String id;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String itemNo;
+
+ /** 宸ュ崟鍙� */
+ @Excel(name = "宸ュ崟鍙�")
+ private String workOrderNo;
+
+ /** 宸ュ簭搴忓彿 */
+ @Excel(name = "宸ュ簭搴忓彿")
+ private Long processNumber;
+
+ /** 宸ュ簭鍚嶇О */
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ /** 宸ュ簭璁″垝寮�濮嬫棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanStartDay;
+
+ /** 宸ュ簭璁″垝缁撴潫鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanEndDay;
+
+ /** 鏈紑宸ユ暟閲� */
+ @Excel(name = "鏈紑宸ユ暟閲�")
+ private Long notStartWorkCount;
+
+ /** 宸插畬鎴愭暟閲� */
+ @Excel(name = "宸插畬鎴愭暟閲�")
+ private Long completedCount;
+ /** 搴熷純鏁伴噺 */
+ @Excel(name = "搴熷純鏁伴噺")
+ private Long discardCount;
+ /** 闆嗘垚鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date integrationDay;
+
+ /** 宸ュ巶 */
+// @Excel(name = "宸ュ巶")
+ private String plant;
+
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ private String delFlag;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setItemNo(String itemNo)
+ {
+ this.itemNo = itemNo;
+ }
+
+ public String getItemNo()
+ {
+ return itemNo;
+ }
+
+ public void setWorkOrderNo(String workOrderNo)
+ {
+ this.workOrderNo = workOrderNo;
+ }
+
+ public String getWorkOrderNo()
+ {
+ return workOrderNo;
+ }
+
+ public void setProcessNumber(Long processNumber)
+ {
+ this.processNumber = processNumber;
+ }
+
+ public Long getProcessNumber()
+ {
+ return processNumber;
+ }
+
+ public void setProcessName(String processName)
+ {
+ this.processName = processName;
+ }
+
+ public String getProcessName()
+ {
+ return processName;
+ }
+
+ public void setProcessPlanStartDay(Date processPlanStartDay)
+ {
+ this.processPlanStartDay = processPlanStartDay;
+ }
+
+ public Date getProcessPlanStartDay()
+ {
+ return processPlanStartDay;
+ }
+
+ public void setProcessPlanEndDay(Date processPlanEndDay)
+ {
+ this.processPlanEndDay = processPlanEndDay;
+ }
+
+ public Date getProcessPlanEndDay()
+ {
+ return processPlanEndDay;
+ }
+
+ public void setNotStartWorkCount(Long notStartWorkCount)
+ {
+ this.notStartWorkCount = notStartWorkCount;
+ }
+
+ public Long getNotStartWorkCount()
+ {
+ return notStartWorkCount;
+ }
+
+ public void setCompletedCount(Long completedCount)
+ {
+ this.completedCount = completedCount;
+ }
+
+ public Long getCompletedCount()
+ {
+ return completedCount;
+ }
+
+ public void setIntegrationDay(Date integrationDay)
+ {
+ this.integrationDay = integrationDay;
+ }
+
+ public Date getIntegrationDay()
+ {
+ return integrationDay;
+ }
+
+ public void setPlant(String plant)
+ {
+ this.plant = plant;
+ }
+
+ public String getPlant()
+ {
+ return plant;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("itemNo", getItemNo())
+ .append("workOrderNo", getWorkOrderNo())
+ .append("processNumber", getProcessNumber())
+ .append("processName", getProcessName())
+ .append("processPlanStartDay", getProcessPlanStartDay())
+ .append("processPlanEndDay", getProcessPlanEndDay())
+ .append("notStartWorkCount", getNotStartWorkCount())
+ .append("completedCount", getCompletedCount())
+ .append("integrationDay", getIntegrationDay())
+ .append("plant", getPlant())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+
+ public Long getDiscardCount() {
+ return discardCount;
+ }
+
+ public void setDiscardCount(Long discardCount) {
+ this.discardCount = discardCount;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
new file mode 100644
index 0000000..1e5b672
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRouteTemp.java
@@ -0,0 +1,235 @@
+package com.aps.core.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
+
+/**
+ * 宸ヨ壓璺嚎-涓存椂瀵硅薄 aps_process_route_temp
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+public class ApsProcessRouteTemp extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private String id;
+
+ /** 鏂欏彿 */
+ @Excel(name = "鏂欏彿")
+ private String itemNo;
+
+ /** 宸ュ崟鍙� */
+ @Excel(name = "宸ュ崟鍙�")
+ private String workOrderNo;
+
+ /** 宸ュ簭搴忓彿 */
+ @Excel(name = "宸ュ簭搴忓彿")
+ private Long processNumber;
+
+ /** 宸ュ簭鍚嶇О */
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ /** 宸ュ簭璁″垝寮�濮嬫棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanStartDay;
+
+ /** 宸ュ簭璁″垝缁撴潫鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanEndDay;
+
+ /** 鏈紑宸ユ暟閲� */
+ @Excel(name = "鏈紑宸ユ暟閲�")
+ private Long notStartWorkCount;
+
+ /** 宸插畬鎴愭暟閲� */
+ @Excel(name = "宸插畬鎴愭暟閲�")
+ private Long completedCount;
+ /** 搴熷純鏁伴噺 */
+ @Excel(name = "搴熷純鏁伴噺")
+ private Long discardCount;
+ /** 闆嗘垚鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date integrationDay;
+
+ /** 鎵规鍙� */
+ @Excel(name = "鎵规鍙�")
+ private String batchNumber;
+
+ /** 宸ュ巶 */
+ @Excel(name = "宸ュ巶")
+ private String plant;
+
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ private String delFlag;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setItemNo(String itemNo)
+ {
+ this.itemNo = itemNo;
+ }
+
+ public String getItemNo()
+ {
+ return itemNo;
+ }
+
+ public void setWorkOrderNo(String workOrderNo)
+ {
+ this.workOrderNo = workOrderNo;
+ }
+
+ public String getWorkOrderNo()
+ {
+ return workOrderNo;
+ }
+
+ public void setProcessNumber(Long processNumber)
+ {
+ this.processNumber = processNumber;
+ }
+
+ public Long getProcessNumber()
+ {
+ return processNumber;
+ }
+
+ public void setProcessName(String processName)
+ {
+ this.processName = processName;
+ }
+
+ public String getProcessName()
+ {
+ return processName;
+ }
+
+ public void setProcessPlanStartDay(Date processPlanStartDay)
+ {
+ this.processPlanStartDay = processPlanStartDay;
+ }
+
+ public Date getProcessPlanStartDay()
+ {
+ return processPlanStartDay;
+ }
+
+ public void setProcessPlanEndDay(Date processPlanEndDay)
+ {
+ this.processPlanEndDay = processPlanEndDay;
+ }
+
+ public Date getProcessPlanEndDay()
+ {
+ return processPlanEndDay;
+ }
+
+ public void setNotStartWorkCount(Long notStartWorkCount)
+ {
+ this.notStartWorkCount = notStartWorkCount;
+ }
+
+ public Long getNotStartWorkCount()
+ {
+ return notStartWorkCount;
+ }
+
+ public void setCompletedCount(Long completedCount)
+ {
+ this.completedCount = completedCount;
+ }
+
+ public Long getCompletedCount()
+ {
+ return completedCount;
+ }
+
+ public void setIntegrationDay(Date integrationDay)
+ {
+ this.integrationDay = integrationDay;
+ }
+
+ public Date getIntegrationDay()
+ {
+ return integrationDay;
+ }
+
+ public void setBatchNumber(String batchNumber)
+ {
+ this.batchNumber = batchNumber;
+ }
+
+ public String getBatchNumber()
+ {
+ return batchNumber;
+ }
+
+ public void setPlant(String plant)
+ {
+ this.plant = plant;
+ }
+
+ public String getPlant()
+ {
+ return plant;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("itemNo", getItemNo())
+ .append("workOrderNo", getWorkOrderNo())
+ .append("processNumber", getProcessNumber())
+ .append("processName", getProcessName())
+ .append("processPlanStartDay", getProcessPlanStartDay())
+ .append("processPlanEndDay", getProcessPlanEndDay())
+ .append("notStartWorkCount", getNotStartWorkCount())
+ .append("completedCount", getCompletedCount())
+ .append("integrationDay", getIntegrationDay())
+ .append("batchNumber", getBatchNumber())
+ .append("plant", getPlant())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+
+ public Long getDiscardCount() {
+ return discardCount;
+ }
+
+ public void setDiscardCount(Long discardCount) {
+ this.discardCount = discardCount;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteMapper.java
new file mode 100644
index 0000000..29fd481
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsProcessRoute;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ヨ壓璺嚎Mapper鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@Mapper
+public interface ApsProcessRouteMapper
+{
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 宸ヨ壓璺嚎
+ */
+ public ApsProcessRoute selectApsProcessRouteById(String id);
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 宸ヨ壓璺嚎闆嗗悎
+ */
+ public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 鏂板宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 淇敼宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteTempMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteTempMapper.java
new file mode 100644
index 0000000..d2f9586
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsProcessRouteTempMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsProcessRouteTemp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ヨ壓璺嚎-涓存椂Mapper鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@Mapper
+public interface ApsProcessRouteTempMapper
+{
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 宸ヨ壓璺嚎-涓存椂
+ */
+ public ApsProcessRouteTemp selectApsProcessRouteTempById(String id);
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂鍒楄〃
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 宸ヨ壓璺嚎-涓存椂闆嗗悎
+ */
+ public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 鏂板宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 淇敼宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎-涓存椂
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteTempById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteTempByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteService.java
new file mode 100644
index 0000000..80e6563
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteService.java
@@ -0,0 +1,64 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsProcessRoute;
+import com.aps.core.domain.ApsProcessRouteTemp;
+
+/**
+ * 宸ヨ壓璺嚎Service鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+public interface IApsProcessRouteService
+{
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 宸ヨ壓璺嚎
+ */
+ public ApsProcessRoute selectApsProcessRouteById(String id);
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 宸ヨ壓璺嚎闆嗗悎
+ */
+ public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 鏂板宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 淇敼宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute);
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑宸ヨ壓璺嚎涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎淇℃伅
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteById(String id);
+
+ int confirmProcessRoute(ApsProcessRouteTemp apsProcessRouteTemp);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteTempService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteTempService.java
new file mode 100644
index 0000000..cc801eb
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsProcessRouteTempService.java
@@ -0,0 +1,61 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsProcessRouteTemp;
+
+/**
+ * 宸ヨ壓璺嚎-涓存椂Service鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+public interface IApsProcessRouteTempService
+{
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 宸ヨ壓璺嚎-涓存椂
+ */
+ public ApsProcessRouteTemp selectApsProcessRouteTempById(String id);
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂鍒楄〃
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 宸ヨ壓璺嚎-涓存椂闆嗗悎
+ */
+ public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 鏂板宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 淇敼宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp);
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑宸ヨ壓璺嚎-涓存椂涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteTempByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎-涓存椂淇℃伅
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsProcessRouteTempById(String id);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
index be8a04b..26ed8e3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsGasPipingPlanTemp;
import com.aps.core.domain.ApsPartPlan;
@@ -63,6 +64,7 @@
public int insertApsGasPipingPlan(ApsGasPipingPlan apsGasPipingPlan)
{
apsGasPipingPlan.setId(IdUtils.fastUUID());
+ apsGasPipingPlan.setCreateTime(DateUtils.getNowDate());
return apsGasPipingPlanMapper.insertApsGasPipingPlan(apsGasPipingPlan);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanTempServiceImpl.java
index e2a35d3..25d5494 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanTempServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
public int insertApsGasPipingPlanTemp(ApsGasPipingPlanTemp apsGasPipingPlanTemp)
{
apsGasPipingPlanTemp.setId(IdUtils.fastUUID());
+ apsGasPipingPlanTemp.setCreateTime(DateUtils.getNowDate());
return apsGasPipingPlanTempMapper.insertApsGasPipingPlanTemp(apsGasPipingPlanTemp);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
index 842b6d3..42be4e5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.mapper.ApsPartPlanTempMapper;
@@ -61,6 +62,7 @@
public int insertApsPartPlan(ApsPartPlan apsPartPlan)
{
apsPartPlan.setId(IdUtils.fastUUID());
+ apsPartPlan.setCreateTime(DateUtils.getNowDate());
return apsPartPlanMapper.insertApsPartPlan(apsPartPlan);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
index 9bfaca7..4091432 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartPlanTempServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
public int insertApsPartPlanTemp(ApsPartPlanTemp apsPartPlanTemp)
{
apsPartPlanTemp.setId(IdUtils.fastUUID());
+ apsPartPlanTemp.setCreateTime(DateUtils.getNowDate());
return apsPartPlanTempMapper.insertApsPartPlanTemp(apsPartPlanTemp);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index f4f90aa..8e3c6ce 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Optional;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPlatePlanTemp;
@@ -68,6 +69,7 @@
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
apsPlatePlan.setId(IdUtils.fastUUID());
+ apsPlatePlan.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java
index b9beab4..10b48df 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanTempServiceImpl.java
@@ -1,6 +1,8 @@
package com.aps.core.service.impl;
import java.util.List;
+
+import com.aps.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlatePlanTempMapper;
@@ -52,6 +54,7 @@
@Override
public int insertApsPlatePlanTemp(ApsPlatePlanTemp apsPlatePlanTemp)
{
+ apsPlatePlanTemp.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanTempMapper.insertApsPlatePlanTemp(apsPlatePlanTemp);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
new file mode 100644
index 0000000..22e9289
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
@@ -0,0 +1,128 @@
+package com.aps.core.service.impl;
+
+import java.util.List;
+import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.core.domain.ApsProcessRouteTemp;
+import com.aps.core.mapper.ApsProcessRouteTempMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.aps.core.mapper.ApsProcessRouteMapper;
+import com.aps.core.domain.ApsProcessRoute;
+import com.aps.core.service.IApsProcessRouteService;
+
+/**
+ * 宸ヨ壓璺嚎Service涓氬姟灞傚鐞�
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@Service
+public class ApsProcessRouteServiceImpl implements IApsProcessRouteService
+{
+ @Autowired
+ private ApsProcessRouteMapper apsProcessRouteMapper;
+ @Autowired
+ private ApsProcessRouteTempMapper apsProcessRouteTempMapper;
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 宸ヨ壓璺嚎
+ */
+ @Override
+ public ApsProcessRoute selectApsProcessRouteById(String id)
+ {
+ return apsProcessRouteMapper.selectApsProcessRouteById(id);
+ }
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎鍒楄〃
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 宸ヨ壓璺嚎
+ */
+ @Override
+ public List<ApsProcessRoute> selectApsProcessRouteList(ApsProcessRoute apsProcessRoute)
+ {
+ return apsProcessRouteMapper.selectApsProcessRouteList(apsProcessRoute);
+ }
+
+ /**
+ * 鏂板宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsProcessRoute(ApsProcessRoute apsProcessRoute)
+ {
+ apsProcessRoute.setId(IdUtils.fastUUID());
+ apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+ return apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+ }
+
+ /**
+ * 淇敼宸ヨ壓璺嚎
+ *
+ * @param apsProcessRoute 宸ヨ壓璺嚎
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsProcessRoute(ApsProcessRoute apsProcessRoute)
+ {
+ apsProcessRoute.setUpdateTime(DateUtils.getNowDate());
+ return apsProcessRouteMapper.updateApsProcessRoute(apsProcessRoute);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑宸ヨ壓璺嚎涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProcessRouteByIds(String[] ids)
+ {
+ return apsProcessRouteMapper.deleteApsProcessRouteByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎淇℃伅
+ *
+ * @param id 宸ヨ壓璺嚎涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProcessRouteById(String id)
+ {
+ return apsProcessRouteMapper.deleteApsProcessRouteById(id);
+ }
+
+ @Override
+ public int confirmProcessRoute(ApsProcessRouteTemp apsProcessRouteTemp) {
+ //鏌ヨ涓存椂琛ㄦ暟鎹�
+ List<ApsProcessRouteTemp> apsProcessRouteTemps =apsProcessRouteTempMapper.selectApsProcessRouteTempList(apsProcessRouteTemp);
+ int count=0;
+ String[] ids=new String[apsProcessRouteTemps.size()];
+ for (int i = 0; i < apsProcessRouteTemps.size() ; i++) {
+ //璁板綍涓存椂琛╥d
+ ids[i]= apsProcessRouteTemps.get(i).getId();
+ ApsProcessRoute apsProcessRoute =new ApsProcessRoute();
+ BeanUtils.copyProperties(apsProcessRouteTemps.get(i), apsProcessRoute);
+ apsProcessRoute.setId(IdUtils.fastUUID());
+ //鎻掑叆姝ｅ紡琛紝骞惰褰�
+ apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+ apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
+ apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+ count++;
+ }
+ //鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
+ if (count== apsProcessRouteTemps.size()) {
+ apsProcessRouteTempMapper.deleteApsProcessRouteTempByIds(ids);
+ }
+ return 1;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteTempServiceImpl.java
new file mode 100644
index 0000000..d175cbd
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteTempServiceImpl.java
@@ -0,0 +1,98 @@
+package com.aps.core.service.impl;
+
+import java.util.List;
+import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.aps.core.mapper.ApsProcessRouteTempMapper;
+import com.aps.core.domain.ApsProcessRouteTemp;
+import com.aps.core.service.IApsProcessRouteTempService;
+
+/**
+ * 宸ヨ壓璺嚎-涓存椂Service涓氬姟灞傚鐞�
+ *
+ * @author wwj
+ * @date 2025-04-10
+ */
+@Service
+public class ApsProcessRouteTempServiceImpl implements IApsProcessRouteTempService
+{
+ @Autowired
+ private ApsProcessRouteTempMapper apsProcessRouteTempMapper;
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 宸ヨ壓璺嚎-涓存椂
+ */
+ @Override
+ public ApsProcessRouteTemp selectApsProcessRouteTempById(String id)
+ {
+ return apsProcessRouteTempMapper.selectApsProcessRouteTempById(id);
+ }
+
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎-涓存椂鍒楄〃
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 宸ヨ壓璺嚎-涓存椂
+ */
+ @Override
+ public List<ApsProcessRouteTemp> selectApsProcessRouteTempList(ApsProcessRouteTemp apsProcessRouteTemp)
+ {
+ return apsProcessRouteTempMapper.selectApsProcessRouteTempList(apsProcessRouteTemp);
+ }
+
+ /**
+ * 鏂板宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp)
+ {
+ apsProcessRouteTemp.setId(IdUtils.fastUUID());
+ apsProcessRouteTemp.setCreateTime(DateUtils.getNowDate());
+ return apsProcessRouteTempMapper.insertApsProcessRouteTemp(apsProcessRouteTemp);
+ }
+
+ /**
+ * 淇敼宸ヨ壓璺嚎-涓存椂
+ *
+ * @param apsProcessRouteTemp 宸ヨ壓璺嚎-涓存椂
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsProcessRouteTemp(ApsProcessRouteTemp apsProcessRouteTemp)
+ {
+ apsProcessRouteTemp.setUpdateTime(DateUtils.getNowDate());
+ return apsProcessRouteTempMapper.updateApsProcessRouteTemp(apsProcessRouteTemp);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProcessRouteTempByIds(String[] ids)
+ {
+ return apsProcessRouteTempMapper.deleteApsProcessRouteTempByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎宸ヨ壓璺嚎-涓存椂淇℃伅
+ *
+ * @param id 宸ヨ壓璺嚎-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsProcessRouteTempById(String id)
+ {
+ return apsProcessRouteTempMapper.deleteApsProcessRouteTempById(id);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index 9299fc9..24d3f36 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsPartPlan;
@@ -64,6 +65,7 @@
public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam)
{
apsWeldSeam.setId(IdUtils.fastUUID());
+ apsWeldSeam.setCreateTime(DateUtils.getNowDate());
return apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
index 83c4232..c621166 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamStatisticsMapper;
@@ -53,6 +54,7 @@
@Override
public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
{
+ apsWeldSeamStatistics.setId(IdUtils.fastUUID());
apsWeldSeamStatistics.setCreateTime(DateUtils.getNowDate());
return apsWeldSeamStatisticsMapper.insertApsWeldSeamStatistics(apsWeldSeamStatistics);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java
index fb3b84a..fff82b5 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@
public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
{
apsWeldSeamTemp.setId(IdUtils.fastUUID());
+ apsWeldSeamTemp.setCreateTime(DateUtils.getNowDate());
return apsWeldSeamTempMapper.insertApsWeldSeamTemp(apsWeldSeamTemp);
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
new file mode 100644
index 0000000..d54cd15
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
@@ -0,0 +1,126 @@
+<?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.aps.core.mapper.ApsProcessRouteMapper">
+
+ <resultMap type="ApsProcessRoute" id="ApsProcessRouteResult">
+ <result property="id" column="id" />
+ <result property="itemNo" column="item_no" />
+ <result property="workOrderNo" column="work_order_no" />
+ <result property="processNumber" column="process_number" />
+ <result property="processName" column="process_name" />
+ <result property="processPlanStartDay" column="process_plan_start_day" />
+ <result property="processPlanEndDay" column="process_plan_end_day" />
+ <result property="notStartWorkCount" column="not_start_work_count" />
+ <result property="completedCount" column="completed_count" />
+ <result property="discardCount" column="discard_count" />
+ <result property="integrationDay" column="integration_day" />
+ <result property="plant" column="plant" />
+ <result property="delFlag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectApsProcessRouteVo">
+ select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route
+ </sql>
+
+ <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
+ <include refid="selectApsProcessRouteVo"/>
+ <where>
+ <if test="itemNo != null and itemNo != ''"> and item_no like '%' || #{itemNo} || '%' </if>
+ <if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="processNumber != null "> and process_number = #{processNumber}</if>
+ <if test="processName != null and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
+ <if test="processPlanStartDay != null "> and process_plan_start_day = #{processPlanStartDay}</if>
+ <if test="processPlanEndDay != null "> and process_plan_end_day = #{processPlanEndDay}</if>
+ <if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
+ <if test="completedCount != null "> and completed_count = #{completedCount}</if>
+ <if test="discardCount != null "> and discard_count = #{discardCount}</if>
+ <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
+ <if test="plant != null and plant != ''"> and plant = #{plant}</if>
+ </where>
+ </select>
+
+ <select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
+ </select>
+
+ <insert id="insertApsProcessRoute" parameterType="ApsProcessRoute">
+ insert into aps_process_route
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="itemNo != null">item_no,</if>
+ <if test="workOrderNo != null">work_order_no,</if>
+ <if test="processNumber != null">process_number,</if>
+ <if test="processName != null">process_name,</if>
+ <if test="processPlanStartDay != null">process_plan_start_day,</if>
+ <if test="processPlanEndDay != null">process_plan_end_day,</if>
+ <if test="notStartWorkCount != null">not_start_work_count,</if>
+ <if test="completedCount != null">completed_count,</if>
+ <if test="discardCount != null">discard_count,</if>
+ <if test="integrationDay != null">integration_day,</if>
+ <if test="plant != null">plant,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="itemNo != null">#{itemNo},</if>
+ <if test="workOrderNo != null">#{workOrderNo},</if>
+ <if test="processNumber != null">#{processNumber},</if>
+ <if test="processName != null">#{processName},</if>
+ <if test="processPlanStartDay != null">#{processPlanStartDay},</if>
+ <if test="processPlanEndDay != null">#{processPlanEndDay},</if>
+ <if test="notStartWorkCount != null">#{notStartWorkCount},</if>
+ <if test="completedCount != null">#{completedCount},</if>
+ <if test="discardCount != null">#{discardCount},</if>
+ <if test="integrationDay != null">#{integrationDay},</if>
+ <if test="plant != null">#{plant},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateApsProcessRoute" parameterType="ApsProcessRoute">
+ update aps_process_route
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="itemNo != null">item_no = #{itemNo},</if>
+ <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
+ <if test="processNumber != null">process_number = #{processNumber},</if>
+ <if test="processName != null">process_name = #{processName},</if>
+ <if test="processPlanStartDay != null">process_plan_start_day = #{processPlanStartDay},</if>
+ <if test="processPlanEndDay != null">process_plan_end_day = #{processPlanEndDay},</if>
+ <if test="notStartWorkCount != null">not_start_work_count = #{notStartWorkCount},</if>
+ <if test="completedCount != null">completed_count = #{completedCount},</if>
+ <if test="discardCount != null">discard_count = #{discardCount},</if>
+ <if test="integrationDay != null">integration_day = #{integrationDay},</if>
+ <if test="plant != null">plant = #{plant},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteApsProcessRouteById" parameterType="String">
+ delete from aps_process_route where id = #{id}
+ </delete>
+
+ <delete id="deleteApsProcessRouteByIds" parameterType="String">
+ delete from aps_process_route where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml
new file mode 100644
index 0000000..385f6d1
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteTempMapper.xml
@@ -0,0 +1,131 @@
+<?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.aps.core.mapper.ApsProcessRouteTempMapper">
+
+ <resultMap type="ApsProcessRouteTemp" id="ApsProcessRouteTempResult">
+ <result property="id" column="id" />
+ <result property="itemNo" column="item_no" />
+ <result property="workOrderNo" column="work_order_no" />
+ <result property="processNumber" column="process_number" />
+ <result property="processName" column="process_name" />
+ <result property="processPlanStartDay" column="process_plan_start_day" />
+ <result property="processPlanEndDay" column="process_plan_end_day" />
+ <result property="notStartWorkCount" column="not_start_work_count" />
+ <result property="completedCount" column="completed_count" />
+ <result property="discardCount" column="discard_count" />
+ <result property="integrationDay" column="integration_day" />
+ <result property="batchNumber" column="batch_number" />
+ <result property="plant" column="plant" />
+ <result property="delFlag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectApsProcessRouteTempVo">
+ select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, batch_number, plant, del_flag, create_by, create_time, update_by, update_time from aps_process_route_temp
+ </sql>
+
+ <select id="selectApsProcessRouteTempList" parameterType="ApsProcessRouteTemp" resultMap="ApsProcessRouteTempResult">
+ <include refid="selectApsProcessRouteTempVo"/>
+ <where>
+ <if test="itemNo != null and itemNo != ''"> and item_no = #{itemNo}</if>
+ <if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="processNumber != null "> and process_number = #{processNumber}</if>
+ <if test="processName != null and processName != ''"> and process_name like concat('%', #{processName}, '%')</if>
+ <if test="processPlanStartDay != null "> and process_plan_start_day = #{processPlanStartDay}</if>
+ <if test="processPlanEndDay != null "> and process_plan_end_day = #{processPlanEndDay}</if>
+ <if test="notStartWorkCount != null "> and not_start_work_count = #{notStartWorkCount}</if>
+ <if test="completedCount != null "> and completed_count = #{completedCount}</if>
+ <if test="discardCount != null "> and discard_count = #{discardCount}</if>
+ <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>
+ <if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
+ <if test="plant != null and plant != ''"> and plant = #{plant}</if>
+ </where>
+ </select>
+
+ <select id="selectApsProcessRouteTempById" parameterType="String" resultMap="ApsProcessRouteTempResult">
+ </select>
+
+ <insert id="insertApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
+ insert into aps_process_route_temp
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="itemNo != null">item_no,</if>
+ <if test="workOrderNo != null">work_order_no,</if>
+ <if test="processNumber != null">process_number,</if>
+ <if test="processName != null">process_name,</if>
+ <if test="processPlanStartDay != null">process_plan_start_day,</if>
+ <if test="processPlanEndDay != null">process_plan_end_day,</if>
+ <if test="notStartWorkCount != null">not_start_work_count,</if>
+ <if test="completedCount != null">completed_count,</if>
+ <if test="discardCount != null">discard_count,</if>
+ <if test="integrationDay != null">integration_day,</if>
+ <if test="batchNumber != null">batch_number,</if>
+ <if test="plant != null">plant,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="itemNo != null">#{itemNo},</if>
+ <if test="workOrderNo != null">#{workOrderNo},</if>
+ <if test="processNumber != null">#{processNumber},</if>
+ <if test="processName != null">#{processName},</if>
+ <if test="processPlanStartDay != null">#{processPlanStartDay},</if>
+ <if test="processPlanEndDay != null">#{processPlanEndDay},</if>
+ <if test="notStartWorkCount != null">#{notStartWorkCount},</if>
+ <if test="completedCount != null">#{completedCount},</if>
+ <if test="discardCount != null">#{discardCount},</if>
+ <if test="integrationDay != null">#{integrationDay},</if>
+ <if test="batchNumber != null">#{batchNumber},</if>
+ <if test="plant != null">#{plant},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateApsProcessRouteTemp" parameterType="ApsProcessRouteTemp">
+ update aps_process_route_temp
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="itemNo != null">item_no = #{itemNo},</if>
+ <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
+ <if test="processNumber != null">process_number = #{processNumber},</if>
+ <if test="processName != null">process_name = #{processName},</if>
+ <if test="processPlanStartDay != null">process_plan_start_day = #{processPlanStartDay},</if>
+ <if test="processPlanEndDay != null">process_plan_end_day = #{processPlanEndDay},</if>
+ <if test="notStartWorkCount != null">not_start_work_count = #{notStartWorkCount},</if>
+ <if test="completedCount != null">completed_count = #{completedCount},</if>
+ <if test="discardCount != null">discard_count = #{discardCount},</if>
+ <if test="integrationDay != null">integration_day = #{integrationDay},</if>
+ <if test="batchNumber != null">batch_number = #{batchNumber},</if>
+ <if test="plant != null">plant = #{plant},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteApsProcessRouteTempById" parameterType="String">
+ delete from aps_process_route_temp where id = #{id}
+ </delete>
+
+ <delete id="deleteApsProcessRouteTempByIds" parameterType="String">
+ delete from aps_process_route_temp where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-system/src/main/resources/bootstrap.yml b/aps-modules/aps-system/src/main/resources/bootstrap.yml
index 3d097e0..6652b46 100644
--- a/aps-modules/aps-system/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-system/src/main/resources/bootstrap.yml
@@ -16,8 +16,8 @@
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 192.168.50.160:8848
# ip: 192.168.50.13
- metadata:
- local: wwj
+# metadata:
+# local: wwj
namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
config:
# 閰嶇疆涓績鍦板潃
--
Gitblit v1.9.3