From 8052785b8f8c423b3ba62b2c546d628b801b18dc Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 30 十二月 2025 08:41:31 +0800
Subject: [PATCH] 新增 动态补片功能
---
north-glass-erp/src/main/java/com/example/erp/ErpApplication.java | 2
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 274 ++++++++++++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 24
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 26 +
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 540 +++++++++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java | 247 +++++++++++++
6 files changed, 1,096 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java b/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
index 2317aa6..ec62c7e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
+++ b/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
@@ -3,6 +3,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -11,6 +12,7 @@
@EnableCaching
@EnableScheduling
@EnableTransactionManagement//浜嬪姟娉ㄨВ
+@EnableAsync //鍚敤寮傛浠诲姟
//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
public class ErpApplication {
public static void main(String[] args) {
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index 3ab6258..4c0c3be 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import com.example.erp.dto.pp.MesCalculateDTO;
import org.springframework.core.io.InputStreamResource;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
@@ -26,6 +27,7 @@
import java.sql.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
@RestController
@Api(value="浼樺寲绠＄悊controller",tags={"浼樺寲绠＄悊鎿嶄綔鎺ュ彛"})
@@ -230,7 +232,7 @@
@PostMapping("/mesCalculate")
public ResponseEntity<Map<String, Object>> receiveOptimizeRequest(
- @RequestBody Map<String, Object> requestData) {
+ @RequestBody MesCalculateDTO mesCalculateDTO) {
Map<String, Object> response = new HashMap<>();
@@ -238,17 +240,22 @@
// 绔嬪嵆杩斿洖鎺ユ敹鎴愬姛鐨勫搷搴�
response.put("code", "200");
response.put("msg", "success");
- response.put("data", "");
+ response.put("data", true);
- // todo 寮傛澶勭悊璁＄畻浠诲姟
-// glassOptimizeService.processExternalOptimizeRequest(requestData);
- System.out.println(requestData);
-
+ // 浣跨敤CompletableFuture 寮傛澶勭悊璁＄畻浠诲姟
+ CompletableFuture.runAsync(() -> {
+ try {
+ glassOptimizeService.processExternalOptimizeRequest(mesCalculateDTO);
+ } catch (Exception e) {
+ System.err.println("寮傛澶勭悊浼樺寲璇锋眰鏃跺彂鐢熼敊璇�: " + e.getMessage());
+ e.printStackTrace();
+ }
+ });
return ResponseEntity.ok(response);
} catch (Exception e) {
response.put("code", 201);
- response.put("msg", "false: " + e.getMessage());
- response.put("data", "");
+ response.put("msg", e.getMessage());
+ response.put("data", false);
return ResponseEntity.status(500).body(response);
}
}
@@ -256,6 +263,7 @@
+
//鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�
@ApiOperation("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�")
@PostMapping ("/getProcessCardDetail/{processId}/{technologyNumber}")
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java
new file mode 100644
index 0000000..59784d4
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/MesCalculateDTO.java
@@ -0,0 +1,247 @@
+package com.example.erp.dto.pp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yujie
+ * @date 2025/12/23 9:23
+ */
+
+
+@Data
+public class MesCalculateDTO {
+
+ @JsonProperty("engineerId")
+ private String engineerId;
+ // private String projectNo;
+
+ @JsonProperty("rawQueueList")
+ private Object rawQueueList;
+
+ private Double usageRate;
+
+ @JsonProperty("engineeringRawQueueList")
+ private List<EngineeringRawQueue> engineeringRawQueueList;
+ // private List<materialDetail> materialDetails;
+
+ @JsonProperty("glassInfoList")
+ private List<GlassInfo> glassInfoList;
+// private List<GlassDetail> glassDetails;
+
+ @JsonProperty("damageList")
+ private List<DamageList> damageList;
+
+ @Data
+ public static class EngineeringRawQueue{
+ @JsonProperty("id")
+ private String id;
+// private String stockCode;
+
+
+
+ @JsonProperty("engineeringId")
+ private String engineeringId;
+// private String projectNo;
+
+ @JsonProperty("filmsId")
+ private String filmsId;
+// private String glassType;
+
+ @JsonProperty("rawGlassWidth")
+ private Double rawGlassWidth;
+// private Double width;
+
+ @JsonProperty("rawGlassHeight")
+ private Double rawGlassHeight;
+// private Double height;
+
+ @JsonProperty("rawGlassThickness")
+ private String rawGlassThickness;
+// private String glassThickness;
+
+ private Integer quantity = 1;
+
+ private Integer priority = 0;
+
+ private Integer materialType = 1;
+
+ private Integer rawSequence;
+
+ private Integer state;
+
+ private String createTime;
+
+ private String updateTime;
+
+ private Object usageRate;
+ }
+
+ @Data
+ public static class GlassInfo {
+
+ private Integer id;
+
+ @JsonProperty("flowCardId")
+ private String flowCardId;
+// private String processId;
+
+ private String orderNumber;
+
+ private Double width;
+
+ private Double height;
+
+ private Integer thickness;
+
+ private String filmsId;
+
+ private Integer layer;
+
+ private Integer totalLayer;
+
+ @JsonProperty("edgWidth")
+ private Double edgWidth;
+// private Double widthGrind;
+
+ @JsonProperty("edgHeight")
+ private Double edgHeight;
+// private Double heightGrind;
+
+ private Integer isMultiple;
+
+ private Double maxWidth;
+
+ private Double maxHeight;
+
+ private Object isHorizontal;
+
+ private Integer rawSequence;
+
+ private Integer temperingLayoutId;
+
+ private Integer temperingFeedSequence;
+
+ private Double angle;
+
+ private String engineerId;
+
+ private Object ruleId;
+
+ private String glassId;
+
+ private Integer combine;
+
+ private String markIcon;
+
+ private Integer quantity = 1;
+
+ private Integer patchState = 1;
+
+ private Object filmRemove;
+
+ private String flowCardSequence;
+
+ private String process;
+
+ private Integer rawAngle;
+
+ private Integer hollowCombineDirection;
+
+ private Integer productSortNumber;
+
+ private Object shelfOrder;
+
+ private Object graphNo;
+
+ private Object processParam;
+
+ private Integer ycoordinate;
+
+ private Integer xcoordinate;
+
+ private Integer xaxis;
+
+ private Integer yaxis;
+
+ }
+
+ @Data
+ public static class DamageList {
+ private Integer id;
+
+ private String flowCardId;
+
+ private String orderNumber;
+
+ private Double width;
+
+ private Double height;
+
+ private Integer thickness;
+
+ private String filmsId;
+
+ private Integer layer;
+
+ private Integer totalLayer;
+
+ private Double edgWidth;
+
+ private Double edgHeight;
+
+ private Integer isMultiple;
+
+ private Double maxWidth;
+
+ private Double maxHeight;
+
+ private Object isHorizontal;
+
+ private Integer rawSequence;
+
+ private Integer temperingLayoutId;
+
+ private Integer temperingFeedSequence;
+
+ private Double angle;
+
+ private String engineerId;
+
+ private Object ruleId;
+
+ private String glassId;
+
+ private Integer combine;
+
+ private String markIcon;
+
+ private Object filmRemove;
+
+ private String flowCardSequence;
+
+ private String process;
+
+ private Integer rawAngle;
+
+ private Integer hollowCombineDirection;
+
+ private Integer productSortNumber;
+
+ private Object shelfOrder;
+
+ private Object graphNo;
+
+ private Object processParam;
+
+ private Integer xcoordinate;
+
+ private Integer ycoordinate;
+
+ private Integer xaxis;
+
+ private Integer yaxis;
+ }
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index 63e20e9..8edde88 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -243,4 +243,30 @@
List<Map<String, Object>> optimizeTemp(String projectNo);
List<Map<String, Object>> selectTempProject(String processId);
+
+ Map<String, Object> getGlassType(String projectNo);
+
+ String getRockNo(Object glassId);
+
+ Map<String, Object> getTrimInfo(String projectNo, Object stockId);
+
+ Map<String, Object> selectOptimizeDynamicProject(String projectNo);
+
+ List<Map<String,Object>> selectOptimizeDynamicLayout(String projectNo);
+
+ List<Map<String,Object>> selectOptimizeDynamicDetail(String projectNo);
+
+ List<Map<String,Object>> selectFlowCardDynamicInfoList(String projectNo);
+
+ void insertDynamicProject(Map<String, Object> dataObj);
+
+ void insertDynamicLayout(Map<String, Object> layout);
+
+ void insertDynamicDetail(List<Map<String, Object>> glassDetails, String projectNo);
+
+ void deleteOptimizeDynamicProject(String projectNo);
+
+ void deleteOptimizeDynamicLayout(String projectNo);
+
+ void deleteOptimizeDynamicDetail(String projectNo);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index a3f2b8e..b3bab2d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -4,17 +4,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.common.RabbitMQUtil;
+import com.example.erp.dto.pp.MesCalculateDTO;
import com.example.erp.entity.pp.*;
-import com.example.erp.entity.sd.Delivery;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
import com.example.erp.service.userInfo.SysErrorService;
import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,18 +21,15 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.sql.Date;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
import java.util.*;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@Service
@@ -1563,5 +1557,533 @@
}
+ public void processExternalOptimizeRequest(MesCalculateDTO mesCalculateDTO){
+ // 浣跨敤鍙嶅皠灏嗗璞¤浆鎹负 Map锛屼娇鐢� Java 瀛楁鍚�
+ List<Map<String, Object>> materialDetailList = new ArrayList<>();
+ if (mesCalculateDTO.getEngineeringRawQueueList() != null) {
+ for (MesCalculateDTO.EngineeringRawQueue materialDetail : mesCalculateDTO.getEngineeringRawQueueList()) {
+ Map<String, Object> materialMap = objectToMapUsingFields(materialDetail);
+ materialDetailList.add(materialMap);
+ }
+ }
+ List<Map<String, Object>> glassDetailList = new ArrayList<>();
+ if (mesCalculateDTO.getGlassInfoList() != null) {
+ for (MesCalculateDTO.GlassInfo glassDetail : mesCalculateDTO.getGlassInfoList()) {
+ Map<String, Object> glassMap = objectToMapUsingFields(glassDetail);
+ glassDetailList.add(glassMap);
+ }
+ }
+
+ List<Map<String, Object>> glassDamageList = new ArrayList<>();
+ if (mesCalculateDTO.getDamageList() != null) {
+ for (MesCalculateDTO.DamageList damageInfo : mesCalculateDTO.getDamageList()) {
+ Map<String, Object> damageMap = objectToMapUsingFields(damageInfo);
+ glassDamageList.add(damageMap);
+ }
+ }
+
+ List<Map<String, Object>> glassDamageTempList = new ArrayList<>();
+ if (mesCalculateDTO.getDamageList() != null) {
+ for (MesCalculateDTO.DamageList damageInfo : mesCalculateDTO.getDamageList()) {
+ Map<String, Object> damageMap = objectToMapUsingFields(damageInfo);
+ // 鍒涘缓鏂扮殑Map鍙繚鐣檊lassId瀛楁骞舵坊鍔爎eportState瀛楁
+ Map<String, Object> filteredDamageMap = new HashMap<>();
+ if (damageMap.containsKey("glassId")) {
+ filteredDamageMap.put("glassId", damageMap.get("glassId"));
+ }
+ filteredDamageMap.put("reportState", 10);
+ glassDamageTempList.add(filteredDamageMap);
+ }
+ }
+
+ String projectNo = mesCalculateDTO.getEngineerId();
+ System.out.println("projectNo: " + projectNo);
+
+ for (Map<String, Object> materialDetail : materialDetailList) {
+ Object stockId = materialDetail.get("rawSequence");
+ Map<String, Object> trimInfo = glassOptimizeMapper.getTrimInfo(projectNo, stockId);
+ if (trimInfo != null) {
+ materialDetail.putAll(trimInfo);
+ }
+ }
+
+ Map<String, Object> glassOptimaizeMap = new HashMap<>();
+ Map<String, Object> optimizeProperty = glassOptimizeMapper.getGlassType(projectNo);
+
+ glassOptimaizeMap.put("requestSource", "ERP");
+ glassOptimaizeMap.put("usageRate", mesCalculateDTO.getUsageRate());
+ glassOptimaizeMap.put("optimizeProperty", optimizeProperty);
+ glassOptimaizeMap.put("engineeringRawQueueList", materialDetailList);
+ glassOptimaizeMap.put("glassInfoList", glassDetailList);
+
+ try {
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ String glassDamageListJson = objectMapper.writeValueAsString(glassDamageList);
+ System.out.println("damageList JSON: " + glassDamageListJson);
+
+ String glassDamageTempListJson = objectMapper.writeValueAsString(glassDamageTempList);
+ System.out.println("glassDamageTempListJson: " + glassDamageTempListJson);
+
+ String optimizeJsonString = objectMapper.writeValueAsString(glassOptimaizeMap);
+ System.out.println("glassTypeMap JSON: " + optimizeJsonString);
+
+ // 鑾峰彇骞惰緭鍑哄姩鎬佷紭鍖栬繑鍥炵粨鏋�
+ String optimizeResult = callDynamicOptimizeApi(optimizeJsonString);
+ System.out.println("鍔ㄦ�佷紭鍖栬繑鍥炵粨鏋�: " + optimizeResult);
+
+ // 灏嗙粨鏋滆浆鎹负JSON鏍煎紡
+ Object optimaizeResultJson = null;
+ try {
+ // 灏濊瘯瑙ｆ瀽涓篔SON瀵硅薄
+ optimaizeResultJson = objectMapper.readValue(optimizeResult, Object.class);
+ } catch (Exception e) {
+ // 濡傛灉涓嶆槸鏈夋晥鐨凧SON瀛楃涓诧紝鍒涘缓涓�涓寘鍚師濮嬪瓧绗︿覆鐨凪ap
+ Map<String, String> errorResult = new HashMap<>();
+ errorResult.put("result", optimizeResult);
+ optimaizeResultJson = errorResult;
+ }
+
+ // 杈撳嚭JSON鏍煎紡鐨勭粨鏋�
+ String jsonOptimizeResult = objectMapper.writeValueAsString(optimaizeResultJson);
+ System.out.println("鍔ㄦ�佷紭鍖栬繑鍥炵粨鏋淛SON鏍煎紡: " + jsonOptimizeResult);
+
+ // 璋冪敤issuingDamageDynamicProjects鎺ュ彛
+ Boolean MESResult = issuingDamageDynamicProjects(projectNo, glassDamageTempList);
+ System.out.println("MES杩斿洖缁撴灉: " + MESResult);
+
+
+ // 妫�鏌ssuingDamageDynamicProjects鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!MESResult) {
+ System.out.println("issuingDamageDynamicProjects鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ return;
+ }
+
+ // 璋冪敤cutFiles鎺ュ彛
+ Boolean cutFileResult = callCutFilesApi(jsonOptimizeResult);
+ System.out.println("璋冪敤cutFiles鎺ュ彛杩斿洖缁撴灉: " + cutFileResult);
+
+ // 妫�鏌utFiles鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!cutFileResult) {
+ System.out.println("cutFiles鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ return;
+ }
+
+ // 璋冪敤issuingDynamicProjects鎺ュ彛
+ Boolean MESTwiceResult = issuingDynamicProjects(projectNo);
+ System.out.println("MES浜屾杩斿洖缁撴灉: " + MESTwiceResult);
+
+ // 妫�鏌ssuingDynamicProjects鎺ュ彛璋冪敤缁撴灉锛屽鏋滃け璐ュ垯鍋滄鍚庣画鎿嶄綔
+ if (!MESTwiceResult) {
+ System.out.println("issuingDynamicProjects鎺ュ彛璋冪敤澶辫触锛屽仠姝㈠悗缁搷浣�");
+ }
+
+ } catch (JsonProcessingException e) {
+ System.err.println("杞崲JSON澶辫触: " + e.getMessage());
+ }
+ }
+
+
+
+
+ // 浣跨敤鍙嶅皠灏嗗璞¤浆鎹负 Map锛屼娇鐢� Java 瀛楁鍚�
+ private Map<String, Object> objectToMapUsingFields(Object obj) {
+ Map<String, Object> map = new HashMap<>();
+ if (obj == null) return map;
+
+ Class<?> clazz = obj.getClass();
+ Field[] fields = clazz.getDeclaredFields();
+
+ for (Field field : fields) {
+ try {
+ field.setAccessible(true);
+ Object value = field.get(obj);
+ // 浣跨敤 Java 瀛楁鍚嶄綔涓� key
+ map.put(field.getName(), value);
+ } catch (IllegalAccessException e) {
+ // 璁板綍鎴栧鐞嗗紓甯�
+ System.err.println("璁块棶瀛楁澶辫触: " + field.getName() + ", 閿欒: " + e.getMessage());
+ }
+ }
+ return map;
+ }
+
+ private String callDynamicOptimizeApi(String jsonData) {
+ try {
+ URL url = new URL("http://" + mesIp + ":8078/api/dynamicOptimize");
+
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+ // 璁剧疆璇锋眰鏂规硶
+ conn.setRequestMethod("POST");
+
+ // 璁剧疆璇锋眰澶�
+ conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+ conn.setRequestProperty("Accept", "application/json");
+
+ // 鍏佽杈撳嚭
+ conn.setDoOutput(true);
+
+ // 璁剧疆瓒呮椂鏃堕棿
+ conn.setConnectTimeout(10000); // 10绉掕繛鎺ヨ秴鏃�
+ conn.setReadTimeout(30000); // 30绉掕鍙栬秴鏃�
+
+ // 鍙戦�丣SON鏁版嵁
+ try (OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonData.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 璇诲彇鍝嶅簲
+ StringBuilder response = new StringBuilder();
+ try (BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ }
+
+ String responseResult = response.toString();
+ System.out.println("浼樺寲杞欢鍝嶅簲缁撴灉: " + responseResult);
+ // 鏂紑杩炴帴
+ conn.disconnect();
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ // 鍚敤绫诲瀷杞崲鍔熻兘锛屽厑璁稿皢娴偣鏁拌浆鎹负鏁存暟
+ objectMapper.configure(DeserializationFeature.ACCEPT_FLOAT_AS_INT, true);
+ Map<String, Object> responseMap = objectMapper.readValue(responseResult, Map.class);
+
+ // 妫�鏌ode鏄惁涓�200
+ Object codeObj = responseMap.get("code");
+ int code = -1;
+ if (codeObj instanceof Integer) {
+ code = (Integer) codeObj;
+ } else if (codeObj instanceof String) {
+ try {
+ code = Integer.parseInt((String) codeObj);
+ } catch (NumberFormatException e) {
+ System.err.println("鏃犳硶瑙ｆ瀽code瀛楁: " + codeObj);
+ }
+ }
+
+ if (code == 200) {
+ // 璁剧疆鍥炴粴鐐癸紝鐢ㄤ簬浜嬪姟澶勭悊
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ // 杩斿洖data瀛楁鐨勫唴瀹逛綔涓篔SON瀛楃涓�
+ Object dataObj = responseMap.get("data");
+ if (dataObj != null) {
+ // 纭繚 dataObj 鏄� Map 绫诲瀷骞堕獙璇� projectNo 瀛楁
+ if (dataObj instanceof Map) {
+ Map<String, Object> dataMap = (Map<String, Object>) dataObj;
+
+ // 楠岃瘉 projectNo 鏄惁瀛樺湪
+ Object projectNoObj = dataMap.get("projectNo");
+ if (projectNoObj == null) {
+ throw new RuntimeException("projectNo 涓嶈兘涓虹┖");
+ }
+
+ String projectNo = projectNoObj.toString();
+ dataMap.put("projectNo", projectNo);
+
+ // 鍒犻櫎宸插瓨鍦ㄧ殑鐩稿叧鏁版嵁
+ glassOptimizeMapper.deleteOptimizeDynamicProject(projectNo);
+ glassOptimizeMapper.deleteOptimizeDynamicLayout(projectNo);
+ glassOptimizeMapper.deleteOptimizeDynamicDetail(projectNo);
+
+ // 鎻掑叆鍔ㄦ�侀」鐩�
+ glassOptimizeMapper.insertDynamicProject(dataMap);
+
+ // 澶勭悊 layouts 鏁扮粍骞舵彃鍏�
+ Object layoutsObj = dataMap.get("layouts");
+ if (layoutsObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> layouts = (List<Map<String, Object>>) layoutsObj;
+
+ for (Map<String, Object> layout : layouts) {
+ // 涓烘瘡涓� layout 娣诲姞 projectNo
+ layout.put("projectNo", projectNo);
+
+ // 鑾峰彇褰撳墠 layout 鐨� glassDetails
+ Object glassDetailsObj = layout.get("glassDetails");
+ if (glassDetailsObj instanceof List) {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> glassDetails = (List<Map<String, Object>>) glassDetailsObj;
+
+ // 涓烘瘡涓� glassDetail 娣诲姞 projectNo 鍜屽鐞� glassPoint
+ for (Map<String, Object> detail : glassDetails) {
+ detail.put("projectNo", projectNo);
+
+
+ // 澶勭悊 isRotate 涓� 1 鏃朵氦鎹� width 鍜� height 鐨勯�昏緫
+ if (detail.containsKey("isRotate")) {
+ Object isRotateObj = detail.get("isRotate");
+ int isRotate = 0;
+ if (isRotateObj instanceof Number) {
+ isRotate = ((Number) isRotateObj).intValue();
+ } else if (isRotateObj instanceof String) {
+ isRotate = Integer.parseInt(isRotateObj.toString());
+ }
+
+ if (isRotate == 1) {
+ // 浜ゆ崲 width 鍜� height
+ Object widthObj = detail.get("width");
+ Object heightObj = detail.get("height");
+ detail.put("width", heightObj);
+ detail.put("height", widthObj);
+
+
+ }
+ }
+
+ // 澶勭悊 glassPoint 瀛楁杞崲
+ if (detail.containsKey("glassPoint")) {
+ Object glassPointObj = detail.get("glassPoint");
+ if (glassPointObj != null) {
+ try {
+ // 濡傛灉 glassPointObj 宸茬粡鏄瓧绗︿覆锛屽垯涓嶉渶瑕佽浆鎹�
+ if (!(glassPointObj instanceof String)) {
+ // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
+ String glassPointStr = objectMapper.writeValueAsString(glassPointObj);
+ detail.put("glassPoint", glassPointStr);
+ }
+ } catch (Exception e) {
+ // 濡傛灉杞崲澶辫触锛岃褰曢敊璇苟绉婚櫎璇ュ瓧娈�
+ System.err.println("杞崲 glassPoint 澶辫触: " + e.getMessage());
+ detail.remove("glassPoint");
+ }
+ } else {
+ // 濡傛灉 glassPointObj 涓� null锛岀Щ闄よ瀛楁
+ detail.remove("glassPoint");
+ }
+ }
+ }
+
+ glassOptimizeMapper.insertDynamicDetail(glassDetails, projectNo);
+ }
+
+ // 鎻掑叆 layout 鍒� optimize_dynamic_layout 琛�
+ glassOptimizeMapper.insertDynamicLayout(layout);
+ }
+ }
+ }
+ return responseResult;
+ } else {
+ return "{}"; // 濡傛灉data瀛楁涓虹┖锛岃繑鍥炵┖JSON瀵硅薄
+ }
+ } catch (Exception e) {
+ // 鍙戠敓寮傚父鏃跺洖婊氫簨鍔�
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ throw e; // 閲嶆柊鎶涘嚭寮傚父
+ }
+ } else {
+ // 褰揷ode涓嶆槸200鏃讹紝杩斿洖閿欒淇℃伅
+ Object messageObj = responseMap.get("message");
+ String errorMessage = "鎺ュ彛杩斿洖閿欒鐮�: " + code;
+ if (messageObj != null) {
+ errorMessage = messageObj.toString();
+ }
+ return errorMessage;
+ }
+
+ } catch (Exception e) {
+ System.err.println("璋冪敤鍔ㄦ�佷紭鍖栨帴鍙ｅけ璐�: " + e.getMessage());
+ e.printStackTrace();
+ return "璋冪敤鍔ㄦ�佷紭鍖栨帴鍙ｅけ璐�: " + e.getMessage();
+ }
+ }
+
+
+ public Boolean issuingDamageDynamicProjects(String projectNo, List<Map<String, Object>> glassDamageTempList){
+ boolean saveState=false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/engineerOptimizeImport");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍑嗗璇锋眰浣�
+
+ // 鑾峰彇glassInfolList鏁版嵁
+ List<Map<String, Object>> glassInfolList = glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo);
+
+ // 澶勭悊damageList锛屽glassInfolList涓瓨鍦ㄧ殑glassId璁剧疆reportState涓�10锛屼笉瀛樺湪鐨勮缃负1
+ List<Map<String, Object>> processedDamageList = new ArrayList<>();
+ Set<String> glassIdSet = new HashSet<>();
+
+ // 鏀堕泦glassInfolList涓殑鎵�鏈塯lassId
+ for (Map<String, Object> glassInfo : glassInfolList) {
+ if (glassInfo.containsKey("glassId") && glassInfo.get("glassId") != null) {
+ glassIdSet.add(glassInfo.get("glassId").toString());
+ }
+ }
+
+ // 澶勭悊glassDamageTempList锛屾牴鎹甮lassId鏄惁鍦╣lassInfolList涓瓨鍦ㄦ潵璁剧疆reportState
+ for (Map<String, Object> damageItem : glassDamageTempList) {
+ if (damageItem.containsKey("glassId") && damageItem.get("glassId") != null) {
+ String glassId = damageItem.get("glassId").toString();
+ Map<String, Object> processedItem = new HashMap<>(damageItem);
+
+ // 濡傛灉glassId鍦╣lassInfolList涓瓨鍦紝reportState淇濇寔涓�10锛屽惁鍒欐敼涓�1
+ if (glassIdSet.contains(glassId)) {
+ // glassId瀛樺湪锛屼繚鎸乺eportState涓�10锛堝凡鍦╣lassDamageTempList涓缃級
+ processedItem.put("reportState", 10);
+ } else {
+ // glassId涓嶅瓨鍦紝灏唕eportState鏀逛负1
+ processedItem.put("reportState", 6);
+ }
+
+ processedDamageList.add(processedItem);
+ }
+ }
+
+ Map<String, Object> optimizeProject=glassOptimizeMapper.selectOptimizeDynamicProject(projectNo);
+ optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeDynamicLayout(projectNo));
+ optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo));
+ optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardDynamicInfoList(projectNo));
+ optimizeProject.put("damageList", processedDamageList);
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.registerModule(new JavaTimeModule());
+ String jsonInputString = mapper.writeValueAsString(optimizeProject);
+ System.out.println("浼犵粰MES鐨勬暟鎹�"+ jsonInputString);
+
+ //鍙戦�佽姹�
+ try(OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 鑾峰彇鍝嶅簲
+ try(BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ System.out.println("MES绗竴娆¤繑鍥炰俊鎭細 " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)&&obj.get("data").equals(true)){
+ saveState=true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState= false;
+ }
+ return saveState;
+ }
+
+
+ public Boolean issuingDynamicProjects(String projectNo){
+ boolean saveState=false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍑嗗璇锋眰浣�
+ Map<String, Object> optimizeProject=glassOptimizeMapper.selectOptimizeDynamicProject(projectNo);
+ optimizeProject.put("engineeringRawQueueList", glassOptimizeMapper.selectOptimizeDynamicLayout(projectNo));
+ optimizeProject.put("glassInfolList", glassOptimizeMapper.selectOptimizeDynamicDetail(projectNo));
+ optimizeProject.put("flowCardInfoList", glassOptimizeMapper.selectFlowCardDynamicInfoList(projectNo));
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.registerModule(new JavaTimeModule());
+ String jsonInputString = mapper.writeValueAsString(optimizeProject);
+
+ //鍙戦�佽姹�
+ try(OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 鑾峰彇鍝嶅簲
+ try(BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ System.out.println("MES绗簩娆¤繑鍥炰俊鎭�: " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)&&obj.get("data").equals(true)){
+ saveState=true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState= false;
+ }
+ return saveState;
+ }
+
+
+ private Boolean callCutFilesApi(String jsonOptimizeResult) {
+ boolean saveState = false;
+ try {
+ System.out.println(mesIp);
+ // 1. 鍒涘缓URL瀵硅薄
+ URL url = new URL("http://" + mesIp + ":8078/api/resultToCutFiles");
+
+ // 2. 鎵撳紑杩炴帴
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "application/json");
+ conn.setDoOutput(true);
+
+ // 3. 鍙戦�佽姹備綋
+ try(OutputStream os = conn.getOutputStream()) {
+ byte[] input = jsonOptimizeResult.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 鑾峰彇鍝嶅簲
+ try(BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+ StringBuilder response = new StringBuilder();
+ String responseLine;
+ while ((responseLine = br.readLine()) != null) {
+ response.append(responseLine.trim());
+ }
+ System.out.println("淇濆瓨鍒囧壊鏂囦欢绔彛杩斿洖鏁版嵁: " + response.toString());
+ JSONObject obj = JSONObject.parseObject(response.toString());
+ if(obj.get("code").equals(200)){
+ saveState = true;
+ }
+
+ }
+
+ //鍏抽棴杩炴帴
+ conn.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ saveState = false;
+ }
+ return saveState;
+ }
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 6658d93..3fddf25 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1558,6 +1558,116 @@
now()
)
</insert>
+ <insert id="insertDynamicProject">
+ INSERT INTO pp.optimize_dynamic_project (
+ project_no,
+ optimize_state,
+ avg_cut_pct,
+ valid_cut_pct,
+ last_cut_pct,
+ raw_stock_qty,
+ raw_stock_area,
+ glass_total,
+ glass_total_area,
+ glass_thickness,
+ glass_type
+ )VALUES (
+ #{projectNo},
+ 1,
+ #{avgCutRate},
+ #{validCutRate},
+ #{lastCutRate},
+ #{totalQuantity},
+ #{totalArea},
+ #{glassTotal},
+ #{glassTotalArea},
+ #{glassThickness},
+ #{glassType}
+ )
+ </insert>
+ <insert id="insertDynamicLayout" parameterType="java.util.Map">
+ INSERT INTO pp.optimize_dynamic_layout (
+ project_no,
+ stock_id,
+ width,
+ height,
+ realwidth,
+ realheight,
+ usage_rate,
+ stock_code,
+ up_trim,
+ down_trim,
+ left_trim,
+ right_trim,
+ count,
+ glass_count,
+ glass_area
+ ) VALUES (
+ #{projectNo},
+ #{stockId},
+ #{width},
+ #{height},
+ #{realWidth},
+ #{realHeight},
+ #{usageRate},
+ #{stockCode},
+ #{upTrim},
+ #{downTrim},
+ #{leftTrim},
+ #{rightTrim},
+ #{quantity},
+ #{glassQuantity},
+ #{glassArea}
+ )
+ </insert>
+ <insert id="insertDynamicDetail" parameterType="map">
+ INSERT INTO pp.optimize_dynamic_detail (
+ project_no,
+ process_id,
+ layer,
+ total_layer,
+ order_sort,
+ stock_id,
+ polys_id,
+ o_width,
+ o_height,
+ p_width,
+ p_height,
+ x_axis,
+ y_axis,
+ patch_state,
+ mark_icon,
+ isRotate,
+ glass_point,
+ glass_id,
+ rack_no,
+ is_remain
+ ) VALUES
+ <foreach collection="glassDetails" item="detail" separator=",">
+ (
+ #{projectNo},
+ #{detail.processId},
+ #{detail.layer},
+ #{detail.totalLayer},
+ #{detail.orderSort},
+ #{detail.stockSort},
+ #{detail.polySort},
+ #{detail.realWidth},
+ #{detail.realHeight},
+ #{detail.width},
+ #{detail.height},
+ #{detail.x},
+ #{detail.y},
+ #{detail.patchState},
+ #{detail.markIcon},
+ #{detail.isRotate},
+ #{detail.glassPoint},
+ #{detail.glassId},
+ #{detail.rackNo},
+ #{detail.isRemain}
+ )
+ </foreach>
+ </insert>
<update id="updateFlowCardRack">
UPDATE pp.flow_card
SET rack = #{rackValue}
@@ -1794,6 +1904,17 @@
</delete>
<delete id="deleteOffcutDetails">
delete from pp.optimize_offcut where project_no = #{processId}
+ </delete>
+ <delete id="deleteOptimizeDynamicProject" parameterType="string">
+ DELETE FROM pp.optimize_dynamic_project WHERE project_no = #{projectNo}
+ </delete>
+
+ <delete id="deleteOptimizeDynamicLayout" parameterType="string">
+ DELETE FROM pp.optimize_dynamic_layout WHERE project_no = #{projectNo}
+ </delete>
+
+ <delete id="deleteOptimizeDynamicDetail" parameterType="string">
+ DELETE FROM pp.optimize_dynamic_detail WHERE project_no = #{projectNo}
</delete>
@@ -2197,6 +2318,159 @@
o_width,
o_height
</select>
+ <select id="getGlassType" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no AS projectNo,
+ glass_type AS glassType,
+ glass_thickness AS glassThickness,
+ min_cut_distance AS minCutDistance,
+ 1 AS optimizeMode,
+ 'X' AS travType,
+ 0 AS rackCycleQty
+ FROM
+ pp.optimize_project
+ WHERE
+ project_no = #{projectNo}
+ </select>
+ <select id="getRockNo" resultType="java.lang.String" parameterType="java.lang.Object">
+ SELECT
+ rack_no AS rackNo
+ FROM
+ pp.optimize_detail
+ WHERE
+ glass_id = #{glassId}
+
+ </select>
+ <select id="getTrimInfo" resultType="java.util.Map">
+ SELECT
+ up_trim,
+ down_trim,
+ left_trim,
+ right_trim,
+ 0 as priority,
+ 1 as materialType
+ FROM
+ pp.optimize_layout
+ WHERE
+ project_no = #{projectNo}
+ AND
+ stock_id = #{stockId}
+ </select>
+ <select id="selectOptimizeDynamicProject" resultType="java.util.Map">
+ select
+ project_no as engineerId,
+ project_name as engineerName,
+ avg_cut_pct as avgAvailability,
+ valid_cut_pct as validAvailability,
+ last_cut_pct as lastAvailability,
+ glass_total as glassTotal,
+ glass_total_area as glassTotalArea,
+ raw_stock_qty as planPatternTotal,
+ raw_stock_area as planPatternTotalArea,
+ glass_thickness as thickness,
+ glass_type as filmsId
+ from
+ pp.optimize_dynamic_project
+ where
+ project_no = #{projectNo}
+ </select>
+ <select id="selectOptimizeDynamicLayout" resultType="java.util.Map" parameterType="java.lang.String">
+ select
+ ol.project_no as engineeringId,
+ op.glass_type as filmsId,
+ ol.realwidth as rawGlassWidth,
+ ol.realheight as rawGlassHeight,
+ op.glass_thickness as rawGlassThickness,
+ ol.stock_id as rawSequence,
+ ol.usage_rate as usageRate
+ from
+ pp.optimize_dynamic_layout ol
+ left join pp.optimize_dynamic_project op on ol.project_no = op.project_no
+ where
+ ol.project_no = #{projectNo}
+ order by
+ ol.stock_id
+ </select>
+ <select id="selectOptimizeDynamicDetail" resultType="java.util.Map" parameterType="java.lang.String">
+ select
+ opd.glass_id as glassId,
+ opd.project_no as engineerId,
+ opd.process_id as flowCardId,
+ od.order_id as orderNumber,
+ opd.order_sort as productSortNumber,
+ IF(LOCATE('涓┖', ogd.process ) > 0 and LOCATE('#', pd.separation ),
+ REPLACE(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")),'#',''),
+ 0) as hollowCombineDirection,
+ opd.o_width as width,
+ opd.o_height as height,
+ op.glass_thickness as thickness,
+ op.glass_type as filmsId,
+ opd.total_layer as totalLayer,
+ opd.layer,
+ opd.stock_id as rawSequence,
+ opd.p_width as edgWidth,
+ opd.p_height as edgHeight,
+ opd.x_axis as xAxis,
+ opd.y_axis as yAxis,
+ if(opd.o_width!=opd.width,1,0) as rawAngle,
+ opd.heat_layout_id as temperingLayoutId,
+ opd.heat_layout_sort as temperingFeedSequence,
+ ohd.x_axis as xCoordinate,
+ ohd.y_axis as yCoordinate,
+ ohd.rotate_angle as angle,
+ IF(LOCATE('涓┖', ogd.process ) > 0 or LOCATE('澶瑰眰', ogd.process ) > 0, 1, 0) as isMultiple,
+ od.width as maxWidth,
+ od.height as maxHeight,
+ opd.mark_icon as markIcon,
+ fc.`merge` as combine,
+ concat( opd.process_id, '/', opd.layer ) as flowCardSequence,
+ ogd.process,
+ if(opd.graph_no=100,0,1) as graphNo
+ from
+ pp.optimize_dynamic_detail opd
+ left join pp.optimize_dynamic_project op on op.project_no = opd.project_no
+ left join pp.flow_card fc on opd.process_id = fc.process_id
+ and opd.layer = fc.technology_number
+ and opd.order_sort = order_number
+ left join sd.`order` o on fc.order_id = o.order_id
+ left join sd.order_detail od on fc.order_id = od.order_id
+ and fc.order_number = od.order_number
+ left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
+ and fc.order_number = ogd.order_number
+ and ogd.technology_number = fc.technology_number
+ left join pp.optimize_heat_detail ohd on ohd.layout_id = opd.heat_layout_id
+ and ohd.sort = opd.heat_layout_sort and ohd.project_no=opd.project_no
+ left join sd.product_detail pd on od.product_id=pd.prod_id and opd.layer=pd.glass_sort
+ where
+ opd.project_no = #{projectNo} and opd.is_remain = 0
+ </select>
+ <select id="selectFlowCardDynamicInfoList" resultType="java.util.Map" parameterType="java.lang.String">
+ select
+ fc.process_id as flowCardId,
+ ogd.child_width as width,
+ ogd.child_height as height,
+ REPLACE (JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.thickness' )), 'mm', '' ) as thickness,
+ JSON_UNQUOTE(JSON_EXTRACT( pd.separation, '$.color' )) as filmsId,
+ fc.layers_number as totalLayer,
+ fc.technology_number as layer,
+ fc.quantity as glassTotal,
+ od.order_number as orderNumber,
+ od.product_name as productName,
+ o.customer_name as customerName
+ from
+ pp.flow_card fc
+ left join sd.`order` o on fc.order_id = o.order_id
+ left join sd.order_detail od on fc.order_id = od.order_id
+ and fc.order_number = od.order_number
+ left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
+ and fc.order_number = ogd.order_number
+ and ogd.technology_number = fc.technology_number
+ left join sd.product p on od.product_id = p.id
+ left join sd.product_detail pd on od.product_id = pd.prod_id
+ and fc.technology_number = pd.glass_sort
+ where
+ project_no =#{projectNo}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0