From c701dc41e6dc5935165c2835547e898d2d1565d9 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 16:24:29 +0800
Subject: [PATCH] 焊缝相关
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java | 106 +++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java | 63 ++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamTempMapper.java | 63 ++
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 153 ++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java | 362 +++++++++++
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml | 158 +++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 10
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamTempService.java | 61 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamService.java | 64 ++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingPlanServiceImpl.java | 2
aps-modules/aps-gen/src/main/resources/bootstrap.yml | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamTemp.java | 376 ++++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java | 9
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java | 96 +++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java | 169 +++++
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java | 126 ++++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 2
20 files changed, 1,822 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java
new file mode 100644
index 0000000..bfa990c
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamController.java
@@ -0,0 +1,169 @@
+package com.aps.core.controller;
+
+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.common.security.utils.DictUtils;
+import com.aps.core.domain.ApsWeldSeam;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.service.IApsWeldSeamService;
+import com.aps.core.service.IApsWeldSeamTempService;
+import com.aps.system.api.domain.SysDictData;
+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-09
+ */
+@RestController
+@RequestMapping("/weldSeam")
+public class ApsWeldSeamController extends BaseController {
+ @Autowired
+ private IApsWeldSeamService apsWeldSeamService;
+ @Autowired
+ private IApsWeldSeamTempService apsWeldSeamTempService;
+
+ /**
+ * 鏌ヨ鐒婄紳鍒楄〃
+ */
+ @RequiresPermissions("gasPiping:gasPiping:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsWeldSeam apsWeldSeam) {
+// startPage();
+ List<ApsWeldSeam> list = apsWeldSeamService.selectApsWeldSeamList(apsWeldSeam);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鐒婄紳鍒楄〃
+ */
+ @RequiresPermissions("gasPiping:gasPiping:export")
+ @Log(title = "鐒婄紳", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsWeldSeam apsWeldSeam) {
+ List<ApsWeldSeam> apsWeldSeams = apsWeldSeamService.selectApsWeldSeamList(apsWeldSeam);
+ //宸ュ崟绫诲瀷
+ List<SysDictData> listTypes = DictUtils.getDictCache("aps_weld_work_order_type");
+ //鍒嗙被
+ List<SysDictData> list = DictUtils.getDictCache("aps_weld_classification");
+ for (int i = 0; i < apsWeldSeams.size(); i++) {
+ //鍒嗙被
+ for (int j = 0; j < list.size(); j++) {
+ if (apsWeldSeams.get(i).getClassification().equals(list.get(j).getDictValue())) {
+ apsWeldSeams.get(i).setClassificationTxt(list.get(j).getDictLabel());
+ }
+ }
+ //宸ュ崟绫诲瀷
+ for (int j = 0; j < listTypes.size(); j++) {
+ if (apsWeldSeams.get(i).getWorkOrderType().equals(listTypes.get(j).getDictValue())) {
+ apsWeldSeams.get(i).setWorkOrderTypeTxt(listTypes.get(j).getDictLabel());
+ }
+ }
+ }
+ ExcelUtil<ApsWeldSeam> util = new ExcelUtil<ApsWeldSeam>(ApsWeldSeam.class);
+ util.exportExcel(response, apsWeldSeams, "鐒婄紳鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鐒婄紳璇︾粏淇℃伅
+ */
+ @RequiresPermissions("gasPiping:gasPiping:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id) {
+ return success(apsWeldSeamService.selectApsWeldSeamById(id));
+ }
+
+ /**
+ * 鏂板鐒婄紳
+ */
+ @RequiresPermissions("gasPiping:gasPiping:add")
+ @Log(title = "鐒婄紳", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsWeldSeam apsWeldSeam) {
+ return toAjax(apsWeldSeamService.insertApsWeldSeam(apsWeldSeam));
+ }
+
+ /**
+ * 淇敼鐒婄紳
+ */
+ @RequiresPermissions("gasPiping:gasPiping:edit")
+ @Log(title = "鐒婄紳", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsWeldSeam apsWeldSeam) {
+ return toAjax(apsWeldSeamService.updateApsWeldSeam(apsWeldSeam));
+ }
+
+ /**
+ * 鍒犻櫎鐒婄紳
+ */
+ @RequiresPermissions("gasPiping:gasPiping:remove")
+ @Log(title = "鐒婄紳", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
+ return toAjax(apsWeldSeamService.deleteApsWeldSeamByIds(ids));
+ }
+
+ /**
+ * 鐒婄紳瀵煎叆
+ */
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ ExcelUtil<ApsWeldSeamTemp> util = new ExcelUtil<ApsWeldSeamTemp>(ApsWeldSeamTemp.class);
+ List<ApsWeldSeamTemp> apsWeldSeamTemps = util.importExcel(file.getInputStream());
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (apsWeldSeamTemps.size() > 0) {
+ String batchNum = IdUtils.fastUUID();
+ //宸ュ崟绫诲瀷
+ List<SysDictData> listTypes = DictUtils.getDictCache("aps_weld_work_order_type");
+ //鍒嗙被
+ List<SysDictData> list = DictUtils.getDictCache("aps_weld_classification");
+ for (int i = 0; i < apsWeldSeamTemps.size(); i++) {
+ //鍒嗙被
+ for (int j = 0; j < list.size(); j++) {
+ if (apsWeldSeamTemps.get(i).getClassificationTxt().equals(list.get(j).getDictLabel())) {
+ apsWeldSeamTemps.get(i).setClassification(list.get(j).getDictValue());
+ }
+ }
+ //宸ュ崟绫诲瀷
+ for (int j = 0; j < listTypes.size(); j++) {
+ if (apsWeldSeamTemps.get(i).getWorkOrderTypeTxt().equals(listTypes.get(j).getDictLabel())) {
+ apsWeldSeamTemps.get(i).setWorkOrderType(listTypes.get(j).getDictValue());
+ }
+ }
+ //鎻掑叆鐗堟湰鍙�
+ apsWeldSeamTemps.get(i).setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
+ apsWeldSeamTemps.get(i).setTotalWeldSeam(apsWeldSeamTemps.get(i).getSingleWeldSeam().longValue()*apsWeldSeamTemps.get(i).getProductionQuantity().longValue());
+ apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemps.get(i));
+ }
+
+ return AjaxResult.success("瀵煎叆鎴愬姛", batchNum);
+ } else {
+ return AjaxResult.error("妯℃澘鍐呭涓虹┖");
+ }
+ }
+
+ /***
+ * @Description: 纭涓婁紶
+ * @Param: [apsPartPlan]
+ * @return: com.aps.common.core.web.domain.AjaxResult
+ * @Author: wwj
+ * @Date: 2025/4/9
+ */
+ @GetMapping("/confirmWeldSeam")
+ public AjaxResult confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
+ return toAjax(apsWeldSeamService.confirmWeldSeam(apsWeldSeamTemp));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java
new file mode 100644
index 0000000..3610e87
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsWeldSeamTempController.java
@@ -0,0 +1,106 @@
+package com.aps.core.controller;
+
+import java.util.List;
+import java.io.IOException;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.aps.common.log.annotation.Log;
+import com.aps.common.log.enums.BusinessType;
+import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.service.IApsWeldSeamTempService;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.web.page.TableDataInfo;
+
+/**
+ * 鐒婄紳-涓存椂Controller
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+@RestController
+@RequestMapping("/weldSeamTemp")
+public class ApsWeldSeamTempController extends BaseController
+{
+ @Autowired
+ private IApsWeldSeamTempService apsWeldSeamTempService;
+
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂鍒楄〃
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:list")
+ @GetMapping("/list")
+ public TableDataInfo list(ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+// startPage();
+ List<ApsWeldSeamTemp> list = apsWeldSeamTempService.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鐒婄紳-涓存椂鍒楄〃
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:export")
+ @Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ List<ApsWeldSeamTemp> list = apsWeldSeamTempService.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ ExcelUtil<ApsWeldSeamTemp> util = new ExcelUtil<ApsWeldSeamTemp>(ApsWeldSeamTemp.class);
+ util.exportExcel(response, list, "鐒婄紳-涓存椂鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鐒婄紳-涓存椂璇︾粏淇℃伅
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:query")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(apsWeldSeamTempService.selectApsWeldSeamTempById(id));
+ }
+
+ /**
+ * 鏂板鐒婄紳-涓存椂
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:add")
+ @Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ return toAjax(apsWeldSeamTempService.insertApsWeldSeamTemp(apsWeldSeamTemp));
+ }
+
+ /**
+ * 淇敼鐒婄紳-涓存椂
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:edit")
+ @Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ return toAjax(apsWeldSeamTempService.updateApsWeldSeamTemp(apsWeldSeamTemp));
+ }
+
+ /**
+ * 鍒犻櫎鐒婄紳-涓存椂
+ */
+ @RequiresPermissions("gasPipingTemp:gasPipingTemp:remove")
+ @Log(title = "鐒婄紳-涓存椂", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(apsWeldSeamTempService.deleteApsWeldSeamTempByIds(ids));
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index 4840382..439b258 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -160,7 +160,7 @@
/** 椋庨櫓鏍囪瘑 */
@Excel(name = "椋庨櫓鏍囪瘑")
private Integer hasRisk;
-
+ private String plant;
public void setId(String id)
{
this.id = id;
@@ -559,4 +559,12 @@
public void setIsSuspendedTxt(String isSuspendedTxt) {
this.isSuspendedTxt = isSuspendedTxt;
}
+
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
index 0aed841..5bb7f90 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
@@ -165,6 +165,7 @@
/** 鎵规鍙� */
@Excel(name = "鎵规鍙�")
private String batchNumber;
+ private String plant;
public void setId(String id)
{
@@ -575,4 +576,12 @@
public void setIsSuspendedTxt(String isSuspendedTxt) {
this.isSuspendedTxt = isSuspendedTxt;
}
+
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 6ebb573..e5bd5d7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -168,7 +168,7 @@
private Integer hasRisk;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
index 960aab4..620f749 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
@@ -167,7 +167,7 @@
private String batchNumber;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 2a45e93..3a3ff5e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -161,7 +161,7 @@
private Integer hasRisk;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
index ecce3eb..731e7df 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
@@ -167,7 +167,7 @@
private String batchNumber;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java
new file mode 100644
index 0000000..d828866
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeam.java
@@ -0,0 +1,362 @@
+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_weld_seam
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+public class ApsWeldSeam extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private String id;
+ /** 閿�鍞鍗曞彿 */
+ @Excel(name = "閿�鍞鍗曞彿")
+ private String saleOrderNo;
+
+ /** 閿�鍞鍗曡 */
+ @Excel(name = "閿�鍞鍗曡")
+ private Long saleOrderLine;
+
+ /** 涓诲伐鍗曞彿 */
+ @Excel(name = "涓诲伐鍗曞彿")
+ private String mainWorkOrderNo;
+
+ /** 涓婄骇宸ュ崟鍙� */
+ @Excel(name = "涓婄骇宸ュ崟鍙�")
+ private String superiorWorkOrderNo;
+
+ /** 宸ュ崟鍙� */
+ @Excel(name = "宸ュ崟鍙�")
+ private String workOrderNo;
+ /** 宸ュ崟绫诲瀷 */
+// @Excel(name = "宸ュ崟绫诲瀷")
+ private String workOrderType;
+ @Excel(name = "宸ュ崟绫诲瀷")
+ private String workOrderTypeTxt;
+
+ /** 鐗╂枡缂栫爜 */
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ /** 瀹㈡埛鍥惧彿 */
+ @Excel(name = "瀹㈡埛鍥惧彿")
+ private String customerDrawingNumber;
+
+ /** 鐢熶骇鏁伴噺 */
+ @Excel(name = "鐢熶骇鏁伴噺")
+ private Long productionQuantity;
+ /** 缁勭粐璐﹀彿 */
+ @Excel(name = "缁勭粐璐﹀彿")
+ private String organizeNumber;
+ /** 鐗╂枡闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐗╂枡闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date materialsRequirementDay;
+ /** 鏈鍙嶉鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date thisFeedbackDay;
+ /** 鐢熶骇鍩哄湴 */
+ @Excel(name = "鐢熶骇鍩哄湴")
+ private String productionBase;
+
+ /** 鍒嗙被(姘旀煖/绠¤矾) */
+// @Excel(name = "鍒嗙被(姘旀煖/绠¤矾)")
+ private String classification;
+ @Excel(name = "鍒嗙被")
+ private String classificationTxt;
+
+ /** 鐢熶骇骞翠唤 */
+ @Excel(name = "鐢熶骇骞翠唤")
+ private Long produceYear;
+
+ /** 鐢熶骇鏈堜唤 */
+ @Excel(name = "鐢熶骇鏈堜唤")
+ private Long produceMonth;
+
+
+ /** 瀹㈡埛 */
+ @Excel(name = "瀹㈡埛")
+ private String customer;
+
+ /** 鍗曚欢鐒婄紳 */
+ @Excel(name = "鍗曚欢鐒婄紳")
+ private Long singleWeldSeam;
+
+ /** 鎬荤剨缂� */
+ @Excel(name = "鎬荤剨缂�")
+ private Long totalWeldSeam;
+
+
+
+
+
+
+
+ /** 宸ュ巶 */
+// @Excel(name = "宸ュ巶")
+ private String plant;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setWorkOrderType(String workOrderType)
+ {
+ this.workOrderType = workOrderType;
+ }
+
+ public String getWorkOrderType()
+ {
+ return workOrderType;
+ }
+
+ public void setMaterialCode(String materialCode)
+ {
+ this.materialCode = materialCode;
+ }
+
+ public String getMaterialCode()
+ {
+ return materialCode;
+ }
+
+ public void setCustomerDrawingNumber(String customerDrawingNumber)
+ {
+ this.customerDrawingNumber = customerDrawingNumber;
+ }
+
+ public String getCustomerDrawingNumber()
+ {
+ return customerDrawingNumber;
+ }
+
+ public void setOrganizeNumber(String organizeNumber)
+ {
+ this.organizeNumber = organizeNumber;
+ }
+
+ public String getOrganizeNumber()
+ {
+ return organizeNumber;
+ }
+
+ public void setProductionBase(String productionBase)
+ {
+ this.productionBase = productionBase;
+ }
+
+ public String getProductionBase()
+ {
+ return productionBase;
+ }
+
+ public void setClassification(String classification)
+ {
+ this.classification = classification;
+ }
+
+ public String getClassification()
+ {
+ return classification;
+ }
+
+ public void setProduceYear(Long produceYear)
+ {
+ this.produceYear = produceYear;
+ }
+
+ public Long getProduceYear()
+ {
+ return produceYear;
+ }
+
+ public void setProduceMonth(Long produceMonth)
+ {
+ this.produceMonth = produceMonth;
+ }
+
+ public Long getProduceMonth()
+ {
+ return produceMonth;
+ }
+
+ public void setProductionQuantity(Long productionQuantity)
+ {
+ this.productionQuantity = productionQuantity;
+ }
+
+ public Long getProductionQuantity()
+ {
+ return productionQuantity;
+ }
+
+ public void setCustomer(String customer)
+ {
+ this.customer = customer;
+ }
+
+ public String getCustomer()
+ {
+ return customer;
+ }
+
+ public void setSingleWeldSeam(Long singleWeldSeam)
+ {
+ this.singleWeldSeam = singleWeldSeam;
+ }
+
+ public Long getSingleWeldSeam()
+ {
+ return singleWeldSeam;
+ }
+
+ public void setTotalWeldSeam(Long totalWeldSeam)
+ {
+ this.totalWeldSeam = totalWeldSeam;
+ }
+
+ public Long getTotalWeldSeam()
+ {
+ return totalWeldSeam;
+ }
+
+ public void setThisFeedbackDay(Date thisFeedbackDay)
+ {
+ this.thisFeedbackDay = thisFeedbackDay;
+ }
+
+ public Date getThisFeedbackDay()
+ {
+ return thisFeedbackDay;
+ }
+
+ public void setMaterialsRequirementDay(Date materialsRequirementDay)
+ {
+ this.materialsRequirementDay = materialsRequirementDay;
+ }
+
+ public Date getMaterialsRequirementDay()
+ {
+ return materialsRequirementDay;
+ }
+
+ public void setSaleOrderNo(String saleOrderNo)
+ {
+ this.saleOrderNo = saleOrderNo;
+ }
+
+ public String getSaleOrderNo()
+ {
+ return saleOrderNo;
+ }
+
+ public void setSaleOrderLine(Long saleOrderLine)
+ {
+ this.saleOrderLine = saleOrderLine;
+ }
+
+ public Long getSaleOrderLine()
+ {
+ return saleOrderLine;
+ }
+
+ public void setMainWorkOrderNo(String mainWorkOrderNo)
+ {
+ this.mainWorkOrderNo = mainWorkOrderNo;
+ }
+
+ public String getMainWorkOrderNo()
+ {
+ return mainWorkOrderNo;
+ }
+
+ public void setSuperiorWorkOrderNo(String superiorWorkOrderNo)
+ {
+ this.superiorWorkOrderNo = superiorWorkOrderNo;
+ }
+
+ public String getSuperiorWorkOrderNo()
+ {
+ return superiorWorkOrderNo;
+ }
+
+ public void setWorkOrderNo(String workOrderNo)
+ {
+ this.workOrderNo = workOrderNo;
+ }
+
+ public String getWorkOrderNo()
+ {
+ return workOrderNo;
+ }
+
+ public void setPlant(String plant)
+ {
+ this.plant = plant;
+ }
+
+ public String getPlant()
+ {
+ return plant;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("workOrderType", getWorkOrderType())
+ .append("materialCode", getMaterialCode())
+ .append("customerDrawingNumber", getCustomerDrawingNumber())
+ .append("organizeNumber", getOrganizeNumber())
+ .append("productionBase", getProductionBase())
+ .append("classification", getClassification())
+ .append("produceYear", getProduceYear())
+ .append("produceMonth", getProduceMonth())
+ .append("productionQuantity", getProductionQuantity())
+ .append("customer", getCustomer())
+ .append("singleWeldSeam", getSingleWeldSeam())
+ .append("totalWeldSeam", getTotalWeldSeam())
+ .append("thisFeedbackDay", getThisFeedbackDay())
+ .append("materialsRequirementDay", getMaterialsRequirementDay())
+ .append("saleOrderNo", getSaleOrderNo())
+ .append("saleOrderLine", getSaleOrderLine())
+ .append("mainWorkOrderNo", getMainWorkOrderNo())
+ .append("superiorWorkOrderNo", getSuperiorWorkOrderNo())
+ .append("workOrderNo", getWorkOrderNo())
+ .append("plant", getPlant())
+ .toString();
+ }
+
+ public String getClassificationTxt() {
+ return classificationTxt;
+ }
+
+ public void setClassificationTxt(String classificationTxt) {
+ this.classificationTxt = classificationTxt;
+ }
+
+ public String getWorkOrderTypeTxt() {
+ return workOrderTypeTxt;
+ }
+
+ public void setWorkOrderTypeTxt(String workOrderTypeTxt) {
+ this.workOrderTypeTxt = workOrderTypeTxt;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamTemp.java
new file mode 100644
index 0000000..b497aa1
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWeldSeamTemp.java
@@ -0,0 +1,376 @@
+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_weld_seam_temp
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+public class ApsWeldSeamTemp extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭id */
+ private String id;
+
+ /** 宸ュ崟绫诲瀷 */
+// @Excel(name = "宸ュ崟绫诲瀷")
+ private String workOrderType;
+ @Excel(name = "宸ュ崟绫诲瀷")
+ private String workOrderTypeTxt;
+
+ /** 鐗╂枡缂栫爜 */
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ /** 瀹㈡埛鍥惧彿 */
+ @Excel(name = "瀹㈡埛鍥惧彿")
+ private String customerDrawingNumber;
+
+ /** 缁勭粐璐﹀彿 */
+ @Excel(name = "缁勭粐璐﹀彿")
+ private String organizeNumber;
+
+ /** 鐢熶骇鍩哄湴 */
+ @Excel(name = "鐢熶骇鍩哄湴")
+ private String productionBase;
+
+ /** 鍒嗙被(姘旀煖/绠¤矾) */
+// @Excel(name = "鍒嗙被(姘旀煖/绠¤矾)")
+ private String classification;
+ @Excel(name = "鍒嗙被")
+ private String classificationTxt;
+
+ /** 鐢熶骇骞翠唤 */
+ @Excel(name = "鐢熶骇骞翠唤")
+ private Long produceYear;
+
+ /** 鐢熶骇鏈堜唤 */
+ @Excel(name = "鐢熶骇鏈堜唤")
+ private Long produceMonth;
+
+ /** 鐢熸垚鏁伴噺 */
+ @Excel(name = "鐢熶骇鏁伴噺")
+ private Long productionQuantity;
+
+ /** 瀹㈡埛 */
+ @Excel(name = "瀹㈡埛")
+ private String customer;
+
+ /** 鍗曚欢鐒婄紳 */
+ @Excel(name = "鍗曚欢鐒婄紳")
+ private Long singleWeldSeam;
+
+ /** 鎬荤剨缂� */
+ @Excel(name = "鎬荤剨缂�")
+ private Long totalWeldSeam;
+
+ /** 鏈鍙嶉鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈鍙嶉鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date thisFeedbackDay;
+
+ /** 鐗╂枡闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐗╂枡闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date materialsRequirementDay;
+
+ /** 閿�鍞鍗曞彿 */
+ @Excel(name = "閿�鍞鍗曞彿")
+ private String saleOrderNo;
+
+ /** 閿�鍞鍗曡 */
+ @Excel(name = "閿�鍞鍗曡")
+ private Long saleOrderLine;
+
+ /** 涓诲伐鍗曞彿 */
+ @Excel(name = "涓诲伐鍗曞彿")
+ private String mainWorkOrderNo;
+
+ /** 涓婄骇宸ュ崟鍙� */
+ @Excel(name = "涓婄骇宸ュ崟鍙�")
+ private String superiorWorkOrderNo;
+
+ /** 宸ュ崟鍙� */
+ @Excel(name = "宸ュ崟鍙�")
+ private String workOrderNo;
+
+ /** 宸ュ巶 */
+// @Excel(name = "宸ュ巶")
+ private String plant;
+
+ /** 鎵规鍙� */
+ @Excel(name = "鎵规鍙�")
+ private String batchNumber;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setWorkOrderType(String workOrderType)
+ {
+ this.workOrderType = workOrderType;
+ }
+
+ public String getWorkOrderType()
+ {
+ return workOrderType;
+ }
+
+ public void setMaterialCode(String materialCode)
+ {
+ this.materialCode = materialCode;
+ }
+
+ public String getMaterialCode()
+ {
+ return materialCode;
+ }
+
+ public void setCustomerDrawingNumber(String customerDrawingNumber)
+ {
+ this.customerDrawingNumber = customerDrawingNumber;
+ }
+
+ public String getCustomerDrawingNumber()
+ {
+ return customerDrawingNumber;
+ }
+
+ public void setOrganizeNumber(String organizeNumber)
+ {
+ this.organizeNumber = organizeNumber;
+ }
+
+ public String getOrganizeNumber()
+ {
+ return organizeNumber;
+ }
+
+ public void setProductionBase(String productionBase)
+ {
+ this.productionBase = productionBase;
+ }
+
+ public String getProductionBase()
+ {
+ return productionBase;
+ }
+
+ public void setClassification(String classification)
+ {
+ this.classification = classification;
+ }
+
+ public String getClassification()
+ {
+ return classification;
+ }
+
+ public void setProduceYear(Long produceYear)
+ {
+ this.produceYear = produceYear;
+ }
+
+ public Long getProduceYear()
+ {
+ return produceYear;
+ }
+
+ public void setProduceMonth(Long produceMonth)
+ {
+ this.produceMonth = produceMonth;
+ }
+
+ public Long getProduceMonth()
+ {
+ return produceMonth;
+ }
+
+ public void setProductionQuantity(Long productionQuantity)
+ {
+ this.productionQuantity = productionQuantity;
+ }
+
+ public Long getProductionQuantity()
+ {
+ return productionQuantity;
+ }
+
+ public void setCustomer(String customer)
+ {
+ this.customer = customer;
+ }
+
+ public String getCustomer()
+ {
+ return customer;
+ }
+
+ public void setSingleWeldSeam(Long singleWeldSeam)
+ {
+ this.singleWeldSeam = singleWeldSeam;
+ }
+
+ public Long getSingleWeldSeam()
+ {
+ return singleWeldSeam;
+ }
+
+ public void setTotalWeldSeam(Long totalWeldSeam)
+ {
+ this.totalWeldSeam = totalWeldSeam;
+ }
+
+ public Long getTotalWeldSeam()
+ {
+ return totalWeldSeam;
+ }
+
+ public void setThisFeedbackDay(Date thisFeedbackDay)
+ {
+ this.thisFeedbackDay = thisFeedbackDay;
+ }
+
+ public Date getThisFeedbackDay()
+ {
+ return thisFeedbackDay;
+ }
+
+ public void setMaterialsRequirementDay(Date materialsRequirementDay)
+ {
+ this.materialsRequirementDay = materialsRequirementDay;
+ }
+
+ public Date getMaterialsRequirementDay()
+ {
+ return materialsRequirementDay;
+ }
+
+ public void setSaleOrderNo(String saleOrderNo)
+ {
+ this.saleOrderNo = saleOrderNo;
+ }
+
+ public String getSaleOrderNo()
+ {
+ return saleOrderNo;
+ }
+
+ public void setSaleOrderLine(Long saleOrderLine)
+ {
+ this.saleOrderLine = saleOrderLine;
+ }
+
+ public Long getSaleOrderLine()
+ {
+ return saleOrderLine;
+ }
+
+ public void setMainWorkOrderNo(String mainWorkOrderNo)
+ {
+ this.mainWorkOrderNo = mainWorkOrderNo;
+ }
+
+ public String getMainWorkOrderNo()
+ {
+ return mainWorkOrderNo;
+ }
+
+ public void setSuperiorWorkOrderNo(String superiorWorkOrderNo)
+ {
+ this.superiorWorkOrderNo = superiorWorkOrderNo;
+ }
+
+ public String getSuperiorWorkOrderNo()
+ {
+ return superiorWorkOrderNo;
+ }
+
+ public void setWorkOrderNo(String workOrderNo)
+ {
+ this.workOrderNo = workOrderNo;
+ }
+
+ public String getWorkOrderNo()
+ {
+ return workOrderNo;
+ }
+
+ public void setPlant(String plant)
+ {
+ this.plant = plant;
+ }
+
+ public String getPlant()
+ {
+ return plant;
+ }
+
+ public void setBatchNumber(String batchNumber)
+ {
+ this.batchNumber = batchNumber;
+ }
+
+ public String getBatchNumber()
+ {
+ return batchNumber;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("workOrderType", getWorkOrderType())
+ .append("materialCode", getMaterialCode())
+ .append("customerDrawingNumber", getCustomerDrawingNumber())
+ .append("organizeNumber", getOrganizeNumber())
+ .append("productionBase", getProductionBase())
+ .append("classification", getClassification())
+ .append("produceYear", getProduceYear())
+ .append("produceMonth", getProduceMonth())
+ .append("productionQuantity", getProductionQuantity())
+ .append("customer", getCustomer())
+ .append("singleWeldSeam", getSingleWeldSeam())
+ .append("totalWeldSeam", getTotalWeldSeam())
+ .append("thisFeedbackDay", getThisFeedbackDay())
+ .append("materialsRequirementDay", getMaterialsRequirementDay())
+ .append("saleOrderNo", getSaleOrderNo())
+ .append("saleOrderLine", getSaleOrderLine())
+ .append("mainWorkOrderNo", getMainWorkOrderNo())
+ .append("superiorWorkOrderNo", getSuperiorWorkOrderNo())
+ .append("workOrderNo", getWorkOrderNo())
+ .append("plant", getPlant())
+ .append("batchNumber", getBatchNumber())
+ .toString();
+ }
+
+ public String getWorkOrderTypeTxt() {
+ return workOrderTypeTxt;
+ }
+
+ public void setWorkOrderTypeTxt(String workOrderTypeTxt) {
+ this.workOrderTypeTxt = workOrderTypeTxt;
+ }
+
+ public String getClassificationTxt() {
+ return classificationTxt;
+ }
+
+ public void setClassificationTxt(String classificationTxt) {
+ this.classificationTxt = classificationTxt;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
new file mode 100644
index 0000000..29c4f56
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsWeldSeam;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 鐒婄紳Mapper鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+@Mapper
+public interface ApsWeldSeamMapper
+{
+ /**
+ * 鏌ヨ鐒婄紳
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 鐒婄紳
+ */
+ public ApsWeldSeam selectApsWeldSeamById(String id);
+
+ /**
+ * 鏌ヨ鐒婄紳鍒楄〃
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 鐒婄紳闆嗗悎
+ */
+ public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 鏂板鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 淇敼鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 鍒犻櫎鐒婄紳
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamTempMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamTempMapper.java
new file mode 100644
index 0000000..cc9b11f
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsWeldSeamTempMapper.java
@@ -0,0 +1,63 @@
+package com.aps.core.mapper;
+
+import java.util.List;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 鐒婄紳-涓存椂Mapper鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+@Mapper
+public interface ApsWeldSeamTempMapper
+{
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 鐒婄紳-涓存椂
+ */
+ public ApsWeldSeamTemp selectApsWeldSeamTempById(String id);
+
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂鍒楄〃
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 鐒婄紳-涓存椂闆嗗悎
+ */
+ public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 鏂板鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 淇敼鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 鍒犻櫎鐒婄紳-涓存椂
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamTempById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamTempByIds(String[] ids);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamService.java
new file mode 100644
index 0000000..0b590cc
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamService.java
@@ -0,0 +1,64 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsWeldSeam;
+import com.aps.core.domain.ApsWeldSeamTemp;
+
+/**
+ * 鐒婄紳Service鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+public interface IApsWeldSeamService
+{
+ /**
+ * 鏌ヨ鐒婄紳
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 鐒婄紳
+ */
+ public ApsWeldSeam selectApsWeldSeamById(String id);
+
+ /**
+ * 鏌ヨ鐒婄紳鍒楄〃
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 鐒婄紳闆嗗悎
+ */
+ public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 鏂板鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 淇敼鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam);
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐒婄紳涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎鐒婄紳淇℃伅
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamById(String id);
+
+ int confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp);
+}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamTempService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamTempService.java
new file mode 100644
index 0000000..8eb70a6
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWeldSeamTempService.java
@@ -0,0 +1,61 @@
+package com.aps.core.service;
+
+import java.util.List;
+import com.aps.core.domain.ApsWeldSeamTemp;
+
+/**
+ * 鐒婄紳-涓存椂Service鎺ュ彛
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+public interface IApsWeldSeamTempService
+{
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 鐒婄紳-涓存椂
+ */
+ public ApsWeldSeamTemp selectApsWeldSeamTempById(String id);
+
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂鍒楄〃
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 鐒婄紳-涓存椂闆嗗悎
+ */
+ public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 鏂板鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 淇敼鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp);
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐒婄紳-涓存椂涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamTempByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎鐒婄紳-涓存椂淇℃伅
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteApsWeldSeamTempById(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 06b97cd..be8a04b 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
@@ -122,6 +122,6 @@
if (count==apsGasPipingPlanTemps.size()) {
apsGasPipingPlanTempMapper.deleteApsGasPipingPlanTempByIds(ids);
}
- return 0;
+ return 1;
}
}
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
new file mode 100644
index 0000000..74cf169
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -0,0 +1,126 @@
+package com.aps.core.service.impl;
+
+import java.util.List;
+
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.core.domain.ApsPartPlan;
+import com.aps.core.domain.ApsPartPlanTemp;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.mapper.ApsWeldSeamTempMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.aps.core.mapper.ApsWeldSeamMapper;
+import com.aps.core.domain.ApsWeldSeam;
+import com.aps.core.service.IApsWeldSeamService;
+
+/**
+ * 鐒婄紳Service涓氬姟灞傚鐞�
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+@Service
+public class ApsWeldSeamServiceImpl implements IApsWeldSeamService
+{
+ @Autowired
+ private ApsWeldSeamMapper apsWeldSeamMapper;
+ @Autowired
+ private ApsWeldSeamTempMapper apsWeldSeamTempMapper;
+
+ /**
+ * 鏌ヨ鐒婄紳
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 鐒婄紳
+ */
+ @Override
+ public ApsWeldSeam selectApsWeldSeamById(String id)
+ {
+ return apsWeldSeamMapper.selectApsWeldSeamById(id);
+ }
+
+ /**
+ * 鏌ヨ鐒婄紳鍒楄〃
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 鐒婄紳
+ */
+ @Override
+ public List<ApsWeldSeam> selectApsWeldSeamList(ApsWeldSeam apsWeldSeam)
+ {
+ return apsWeldSeamMapper.selectApsWeldSeamList(apsWeldSeam);
+ }
+
+ /**
+ * 鏂板鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsWeldSeam(ApsWeldSeam apsWeldSeam)
+ {
+ apsWeldSeam.setId(IdUtils.fastUUID());
+ return apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
+ }
+
+ /**
+ * 淇敼鐒婄紳
+ *
+ * @param apsWeldSeam 鐒婄紳
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsWeldSeam(ApsWeldSeam apsWeldSeam)
+ {
+ return apsWeldSeamMapper.updateApsWeldSeam(apsWeldSeam);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐒婄紳涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsWeldSeamByIds(String[] ids)
+ {
+ return apsWeldSeamMapper.deleteApsWeldSeamByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鐒婄紳淇℃伅
+ *
+ * @param id 鐒婄紳涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsWeldSeamById(String id)
+ {
+ return apsWeldSeamMapper.deleteApsWeldSeamById(id);
+ }
+
+ @Override
+ public int confirmWeldSeam(ApsWeldSeamTemp apsWeldSeamTemp) {
+ //鏌ヨ涓存椂琛ㄦ暟鎹�
+ List<ApsWeldSeamTemp> apsWeldSeamTemps=apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ int count=0;
+ String[] ids=new String[apsWeldSeamTemps.size()];
+ for (int i = 0; i <apsWeldSeamTemps.size() ; i++) {
+ //璁板綍涓存椂琛╥d
+ ids[i]=apsWeldSeamTemps.get(i).getId();
+ ApsWeldSeam apsWeldSeam=new ApsWeldSeam();
+ BeanUtils.copyProperties(apsWeldSeamTemps.get(i), apsWeldSeam);
+ apsWeldSeam.setId(IdUtils.fastUUID());
+ //鎻掑叆姝ｅ紡琛紝骞惰褰�
+ apsWeldSeamMapper.insertApsWeldSeam(apsWeldSeam);
+ count++;
+ }
+ //鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
+ if (count==apsWeldSeamTemps.size()) {
+ apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
+ }
+ return 1;
+ }
+}
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
new file mode 100644
index 0000000..fb3b84a
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamTempServiceImpl.java
@@ -0,0 +1,96 @@
+package com.aps.core.service.impl;
+
+import java.util.List;
+
+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.ApsWeldSeamTempMapper;
+import com.aps.core.domain.ApsWeldSeamTemp;
+import com.aps.core.service.IApsWeldSeamTempService;
+
+/**
+ * 鐒婄紳-涓存椂Service涓氬姟灞傚鐞�
+ *
+ * @author wwj
+ * @date 2025-04-09
+ */
+@Service
+public class ApsWeldSeamTempServiceImpl implements IApsWeldSeamTempService
+{
+ @Autowired
+ private ApsWeldSeamTempMapper apsWeldSeamTempMapper;
+
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 鐒婄紳-涓存椂
+ */
+ @Override
+ public ApsWeldSeamTemp selectApsWeldSeamTempById(String id)
+ {
+ return apsWeldSeamTempMapper.selectApsWeldSeamTempById(id);
+ }
+
+ /**
+ * 鏌ヨ鐒婄紳-涓存椂鍒楄〃
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 鐒婄紳-涓存椂
+ */
+ @Override
+ public List<ApsWeldSeamTemp> selectApsWeldSeamTempList(ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ return apsWeldSeamTempMapper.selectApsWeldSeamTempList(apsWeldSeamTemp);
+ }
+
+ /**
+ * 鏂板鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ apsWeldSeamTemp.setId(IdUtils.fastUUID());
+ return apsWeldSeamTempMapper.insertApsWeldSeamTemp(apsWeldSeamTemp);
+ }
+
+ /**
+ * 淇敼鐒婄紳-涓存椂
+ *
+ * @param apsWeldSeamTemp 鐒婄紳-涓存椂
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateApsWeldSeamTemp(ApsWeldSeamTemp apsWeldSeamTemp)
+ {
+ return apsWeldSeamTempMapper.updateApsWeldSeamTemp(apsWeldSeamTemp);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐒婄紳-涓存椂
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐒婄紳-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsWeldSeamTempByIds(String[] ids)
+ {
+ return apsWeldSeamTempMapper.deleteApsWeldSeamTempByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鐒婄紳-涓存椂淇℃伅
+ *
+ * @param id 鐒婄紳-涓存椂涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteApsWeldSeamTempById(String id)
+ {
+ return apsWeldSeamTempMapper.deleteApsWeldSeamTempById(id);
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
new file mode 100644
index 0000000..76b5888
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -0,0 +1,153 @@
+<?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.ApsWeldSeamMapper">
+
+ <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
+ <result property="id" column="id" />
+ <result property="workOrderType" column="work_order_type" />
+ <result property="materialCode" column="material_code" />
+ <result property="customerDrawingNumber" column="customer_drawing_number" />
+ <result property="organizeNumber" column="organize_number" />
+ <result property="productionBase" column="production_base" />
+ <result property="classification" column="classification" />
+ <result property="produceYear" column="produce_year" />
+ <result property="produceMonth" column="produce_month" />
+ <result property="productionQuantity" column="production_quantity" />
+ <result property="customer" column="customer" />
+ <result property="singleWeldSeam" column="single_weld_seam" />
+ <result property="totalWeldSeam" column="total_weld_seam" />
+ <result property="thisFeedbackDay" column="this_feedback_day" />
+ <result property="materialsRequirementDay" column="materials_requirement_day" />
+ <result property="saleOrderNo" column="sale_order_no" />
+ <result property="saleOrderLine" column="sale_order_line" />
+ <result property="mainWorkOrderNo" column="main_work_order_no" />
+ <result property="superiorWorkOrderNo" column="superior_work_order_no" />
+ <result property="workOrderNo" column="work_order_no" />
+ <result property="plant" column="plant" />
+ </resultMap>
+
+ <sql id="selectApsWeldSeamVo">
+ select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
+ </sql>
+
+ <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
+ <include refid="selectApsWeldSeamVo"/>
+ <where>
+ <if test="workOrderType != null and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
+ <if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
+ <if test="customerDrawingNumber != null and customerDrawingNumber != ''"> and customer_drawing_number = #{customerDrawingNumber}</if>
+ <if test="organizeNumber != null and organizeNumber != ''"> and organize_number = #{organizeNumber}</if>
+ <if test="productionBase != null and productionBase != ''"> and production_base = #{productionBase}</if>
+ <if test="classification != null and classification != ''"> and classification = #{classification}</if>
+ <if test="produceYear != null "> and produce_year = #{produceYear}</if>
+ <if test="produceMonth != null "> and produce_month = #{produceMonth}</if>
+ <if test="productionQuantity != null "> and production_quantity = #{productionQuantity}</if>
+ <if test="customer != null and customer != ''"> and customer = #{customer}</if>
+ <if test="singleWeldSeam != null "> and single_weld_seam = #{singleWeldSeam}</if>
+ <if test="totalWeldSeam != null "> and total_weld_seam = #{totalWeldSeam}</if>
+ <if test="params.beginThisFeedbackDay != null and params.beginThisFeedbackDay != '' and params.endThisFeedbackDay != null and params.endThisFeedbackDay != ''"> and this_feedback_day between #{params.beginThisFeedbackDay} and #{params.endThisFeedbackDay}</if>
+ <if test="params.beginMaterialsRequirementDay != null and params.beginMaterialsRequirementDay != '' and params.endMaterialsRequirementDay != null and params.endMaterialsRequirementDay != ''"> and materials_requirement_day between #{params.beginMaterialsRequirementDay} and #{params.endMaterialsRequirementDay}</if>
+ <if test="saleOrderNo != null and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
+ <if test="saleOrderLine != null "> and sale_order_line = #{saleOrderLine}</if>
+ <if test="mainWorkOrderNo != null and mainWorkOrderNo != ''"> and main_work_order_no = #{mainWorkOrderNo}</if>
+ <if test="superiorWorkOrderNo != null and superiorWorkOrderNo != ''"> and superior_work_order_no = #{superiorWorkOrderNo}</if>
+ <if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="plant != null and plant != ''"> and plant = #{plant}</if>
+ </where>
+ </select>
+
+ <select id="selectApsWeldSeamById" parameterType="String" resultMap="ApsWeldSeamResult">
+ <include refid="selectApsWeldSeamVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
+ insert into aps_weld_seam
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="workOrderType != null">work_order_type,</if>
+ <if test="materialCode != null">material_code,</if>
+ <if test="customerDrawingNumber != null">customer_drawing_number,</if>
+ <if test="organizeNumber != null">organize_number,</if>
+ <if test="productionBase != null">production_base,</if>
+ <if test="classification != null">classification,</if>
+ <if test="produceYear != null">produce_year,</if>
+ <if test="produceMonth != null">produce_month,</if>
+ <if test="productionQuantity != null">production_quantity,</if>
+ <if test="customer != null">customer,</if>
+ <if test="singleWeldSeam != null">single_weld_seam,</if>
+ <if test="totalWeldSeam != null">total_weld_seam,</if>
+ <if test="thisFeedbackDay != null">this_feedback_day,</if>
+ <if test="materialsRequirementDay != null">materials_requirement_day,</if>
+ <if test="saleOrderNo != null">sale_order_no,</if>
+ <if test="saleOrderLine != null">sale_order_line,</if>
+ <if test="mainWorkOrderNo != null">main_work_order_no,</if>
+ <if test="superiorWorkOrderNo != null">superior_work_order_no,</if>
+ <if test="workOrderNo != null">work_order_no,</if>
+ <if test="plant != null">plant,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="workOrderType != null">#{workOrderType},</if>
+ <if test="materialCode != null">#{materialCode},</if>
+ <if test="customerDrawingNumber != null">#{customerDrawingNumber},</if>
+ <if test="organizeNumber != null">#{organizeNumber},</if>
+ <if test="productionBase != null">#{productionBase},</if>
+ <if test="classification != null">#{classification},</if>
+ <if test="produceYear != null">#{produceYear},</if>
+ <if test="produceMonth != null">#{produceMonth},</if>
+ <if test="productionQuantity != null">#{productionQuantity},</if>
+ <if test="customer != null">#{customer},</if>
+ <if test="singleWeldSeam != null">#{singleWeldSeam},</if>
+ <if test="totalWeldSeam != null">#{totalWeldSeam},</if>
+ <if test="thisFeedbackDay != null">#{thisFeedbackDay},</if>
+ <if test="materialsRequirementDay != null">#{materialsRequirementDay},</if>
+ <if test="saleOrderNo != null">#{saleOrderNo},</if>
+ <if test="saleOrderLine != null">#{saleOrderLine},</if>
+ <if test="mainWorkOrderNo != null">#{mainWorkOrderNo},</if>
+ <if test="superiorWorkOrderNo != null">#{superiorWorkOrderNo},</if>
+ <if test="workOrderNo != null">#{workOrderNo},</if>
+ <if test="plant != null">#{plant},</if>
+ </trim>
+ </insert>
+
+ <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
+ update aps_weld_seam
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
+ <if test="materialCode != null">material_code = #{materialCode},</if>
+ <if test="customerDrawingNumber != null">customer_drawing_number = #{customerDrawingNumber},</if>
+ <if test="organizeNumber != null">organize_number = #{organizeNumber},</if>
+ <if test="productionBase != null">production_base = #{productionBase},</if>
+ <if test="classification != null">classification = #{classification},</if>
+ <if test="produceYear != null">produce_year = #{produceYear},</if>
+ <if test="produceMonth != null">produce_month = #{produceMonth},</if>
+ <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if>
+ <if test="customer != null">customer = #{customer},</if>
+ <if test="singleWeldSeam != null">single_weld_seam = #{singleWeldSeam},</if>
+ <if test="totalWeldSeam != null">total_weld_seam = #{totalWeldSeam},</if>
+ <if test="thisFeedbackDay != null">this_feedback_day = #{thisFeedbackDay},</if>
+ <if test="materialsRequirementDay != null">materials_requirement_day = #{materialsRequirementDay},</if>
+ <if test="saleOrderNo != null">sale_order_no = #{saleOrderNo},</if>
+ <if test="saleOrderLine != null">sale_order_line = #{saleOrderLine},</if>
+ <if test="mainWorkOrderNo != null">main_work_order_no = #{mainWorkOrderNo},</if>
+ <if test="superiorWorkOrderNo != null">superior_work_order_no = #{superiorWorkOrderNo},</if>
+ <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
+ <if test="plant != null">plant = #{plant},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteApsWeldSeamById" parameterType="String">
+ delete from aps_weld_seam where id = #{id}
+ </delete>
+
+ <delete id="deleteApsWeldSeamByIds" parameterType="String">
+ delete from aps_weld_seam 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/ApsWeldSeamTempMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml
new file mode 100644
index 0000000..fffeb24
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamTempMapper.xml
@@ -0,0 +1,158 @@
+<?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.ApsWeldSeamTempMapper">
+
+ <resultMap type="ApsWeldSeamTemp" id="ApsWeldSeamTempResult">
+ <result property="id" column="id" />
+ <result property="workOrderType" column="work_order_type" />
+ <result property="materialCode" column="material_code" />
+ <result property="customerDrawingNumber" column="customer_drawing_number" />
+ <result property="organizeNumber" column="organize_number" />
+ <result property="productionBase" column="production_base" />
+ <result property="classification" column="classification" />
+ <result property="produceYear" column="produce_year" />
+ <result property="produceMonth" column="produce_month" />
+ <result property="productionQuantity" column="production_quantity" />
+ <result property="customer" column="customer" />
+ <result property="singleWeldSeam" column="single_weld_seam" />
+ <result property="totalWeldSeam" column="total_weld_seam" />
+ <result property="thisFeedbackDay" column="this_feedback_day" />
+ <result property="materialsRequirementDay" column="materials_requirement_day" />
+ <result property="saleOrderNo" column="sale_order_no" />
+ <result property="saleOrderLine" column="sale_order_line" />
+ <result property="mainWorkOrderNo" column="main_work_order_no" />
+ <result property="superiorWorkOrderNo" column="superior_work_order_no" />
+ <result property="workOrderNo" column="work_order_no" />
+ <result property="plant" column="plant" />
+ <result property="batchNumber" column="batch_number" />
+ </resultMap>
+
+ <sql id="selectApsWeldSeamTempVo">
+ select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant, batch_number from aps_weld_seam_temp
+ </sql>
+
+ <select id="selectApsWeldSeamTempList" parameterType="ApsWeldSeamTemp" resultMap="ApsWeldSeamTempResult">
+ <include refid="selectApsWeldSeamTempVo"/>
+ <where>
+ <if test="workOrderType != null and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
+ <if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
+ <if test="customerDrawingNumber != null and customerDrawingNumber != ''"> and customer_drawing_number = #{customerDrawingNumber}</if>
+ <if test="organizeNumber != null and organizeNumber != ''"> and organize_number = #{organizeNumber}</if>
+ <if test="productionBase != null and productionBase != ''"> and production_base = #{productionBase}</if>
+ <if test="classification != null and classification != ''"> and classification = #{classification}</if>
+ <if test="produceYear != null "> and produce_year = #{produceYear}</if>
+ <if test="produceMonth != null "> and produce_month = #{produceMonth}</if>
+ <if test="productionQuantity != null "> and production_quantity = #{productionQuantity}</if>
+ <if test="customer != null and customer != ''"> and customer = #{customer}</if>
+ <if test="singleWeldSeam != null "> and single_weld_seam = #{singleWeldSeam}</if>
+ <if test="totalWeldSeam != null "> and total_weld_seam = #{totalWeldSeam}</if>
+ <if test="params.beginThisFeedbackDay != null and params.beginThisFeedbackDay != '' and params.endThisFeedbackDay != null and params.endThisFeedbackDay != ''"> and this_feedback_day between #{params.beginThisFeedbackDay} and #{params.endThisFeedbackDay}</if>
+ <if test="params.beginMaterialsRequirementDay != null and params.beginMaterialsRequirementDay != '' and params.endMaterialsRequirementDay != null and params.endMaterialsRequirementDay != ''"> and materials_requirement_day between #{params.beginMaterialsRequirementDay} and #{params.endMaterialsRequirementDay}</if>
+ <if test="saleOrderNo != null and saleOrderNo != ''"> and sale_order_no = #{saleOrderNo}</if>
+ <if test="saleOrderLine != null "> and sale_order_line = #{saleOrderLine}</if>
+ <if test="mainWorkOrderNo != null and mainWorkOrderNo != ''"> and main_work_order_no = #{mainWorkOrderNo}</if>
+ <if test="superiorWorkOrderNo != null and superiorWorkOrderNo != ''"> and superior_work_order_no = #{superiorWorkOrderNo}</if>
+ <if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="plant != null and plant != ''"> and plant = #{plant}</if>
+ <if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
+ </where>
+ </select>
+
+ <select id="selectApsWeldSeamTempById" parameterType="String" resultMap="ApsWeldSeamTempResult">
+ <include refid="selectApsWeldSeamTempVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
+ insert into aps_weld_seam_temp
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="workOrderType != null">work_order_type,</if>
+ <if test="materialCode != null">material_code,</if>
+ <if test="customerDrawingNumber != null">customer_drawing_number,</if>
+ <if test="organizeNumber != null">organize_number,</if>
+ <if test="productionBase != null">production_base,</if>
+ <if test="classification != null">classification,</if>
+ <if test="produceYear != null">produce_year,</if>
+ <if test="produceMonth != null">produce_month,</if>
+ <if test="productionQuantity != null">production_quantity,</if>
+ <if test="customer != null">customer,</if>
+ <if test="singleWeldSeam != null">single_weld_seam,</if>
+ <if test="totalWeldSeam != null">total_weld_seam,</if>
+ <if test="thisFeedbackDay != null">this_feedback_day,</if>
+ <if test="materialsRequirementDay != null">materials_requirement_day,</if>
+ <if test="saleOrderNo != null">sale_order_no,</if>
+ <if test="saleOrderLine != null">sale_order_line,</if>
+ <if test="mainWorkOrderNo != null">main_work_order_no,</if>
+ <if test="superiorWorkOrderNo != null">superior_work_order_no,</if>
+ <if test="workOrderNo != null">work_order_no,</if>
+ <if test="plant != null">plant,</if>
+ <if test="batchNumber != null">batch_number,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="workOrderType != null">#{workOrderType},</if>
+ <if test="materialCode != null">#{materialCode},</if>
+ <if test="customerDrawingNumber != null">#{customerDrawingNumber},</if>
+ <if test="organizeNumber != null">#{organizeNumber},</if>
+ <if test="productionBase != null">#{productionBase},</if>
+ <if test="classification != null">#{classification},</if>
+ <if test="produceYear != null">#{produceYear},</if>
+ <if test="produceMonth != null">#{produceMonth},</if>
+ <if test="productionQuantity != null">#{productionQuantity},</if>
+ <if test="customer != null">#{customer},</if>
+ <if test="singleWeldSeam != null">#{singleWeldSeam},</if>
+ <if test="totalWeldSeam != null">#{totalWeldSeam},</if>
+ <if test="thisFeedbackDay != null">#{thisFeedbackDay},</if>
+ <if test="materialsRequirementDay != null">#{materialsRequirementDay},</if>
+ <if test="saleOrderNo != null">#{saleOrderNo},</if>
+ <if test="saleOrderLine != null">#{saleOrderLine},</if>
+ <if test="mainWorkOrderNo != null">#{mainWorkOrderNo},</if>
+ <if test="superiorWorkOrderNo != null">#{superiorWorkOrderNo},</if>
+ <if test="workOrderNo != null">#{workOrderNo},</if>
+ <if test="plant != null">#{plant},</if>
+ <if test="batchNumber != null">#{batchNumber},</if>
+ </trim>
+ </insert>
+
+ <update id="updateApsWeldSeamTemp" parameterType="ApsWeldSeamTemp">
+ update aps_weld_seam_temp
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="workOrderType != null">work_order_type = #{workOrderType},</if>
+ <if test="materialCode != null">material_code = #{materialCode},</if>
+ <if test="customerDrawingNumber != null">customer_drawing_number = #{customerDrawingNumber},</if>
+ <if test="organizeNumber != null">organize_number = #{organizeNumber},</if>
+ <if test="productionBase != null">production_base = #{productionBase},</if>
+ <if test="classification != null">classification = #{classification},</if>
+ <if test="produceYear != null">produce_year = #{produceYear},</if>
+ <if test="produceMonth != null">produce_month = #{produceMonth},</if>
+ <if test="productionQuantity != null">production_quantity = #{productionQuantity},</if>
+ <if test="customer != null">customer = #{customer},</if>
+ <if test="singleWeldSeam != null">single_weld_seam = #{singleWeldSeam},</if>
+ <if test="totalWeldSeam != null">total_weld_seam = #{totalWeldSeam},</if>
+ <if test="thisFeedbackDay != null">this_feedback_day = #{thisFeedbackDay},</if>
+ <if test="materialsRequirementDay != null">materials_requirement_day = #{materialsRequirementDay},</if>
+ <if test="saleOrderNo != null">sale_order_no = #{saleOrderNo},</if>
+ <if test="saleOrderLine != null">sale_order_line = #{saleOrderLine},</if>
+ <if test="mainWorkOrderNo != null">main_work_order_no = #{mainWorkOrderNo},</if>
+ <if test="superiorWorkOrderNo != null">superior_work_order_no = #{superiorWorkOrderNo},</if>
+ <if test="workOrderNo != null">work_order_no = #{workOrderNo},</if>
+ <if test="plant != null">plant = #{plant},</if>
+ <if test="batchNumber != null">batch_number = #{batchNumber},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteApsWeldSeamTempById" parameterType="String">
+ delete from aps_weld_seam_temp where id = #{id}
+ </delete>
+
+ <delete id="deleteApsWeldSeamTempByIds" parameterType="String">
+ delete from aps_weld_seam_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-gen/src/main/resources/bootstrap.yml b/aps-modules/aps-gen/src/main/resources/bootstrap.yml
index 681cf58..0946a3f 100644
--- a/aps-modules/aps-gen/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-gen/src/main/resources/bootstrap.yml
@@ -15,6 +15,8 @@
discovery:
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 192.168.50.160:8848
+ metadata:
+ local: wwj
namespace: 8e9f8829-4286-4925-943a-a6c242767ac2
config:
# 閰嶇疆涓績鍦板潃
--
Gitblit v1.9.3