更新配置文件，调整数据库连接信息，修改标签设置查询，增加标签内容定义规则

.idea/compiler.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="C:/environment/gradle_depot/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
-        </processorPath>
-        <module name="ccl-wms-java.main" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel target="21" />
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\environment\gradle-8.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="ms-21" project-jdk-type="JavaSDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ccl-wms-java.iml" filepath="$PROJECT_DIR$/.idea/modules/ccl-wms-java.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

build.gradle

@@ -27,7 +27,7 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
-	implementation 'org.springframework.boot:spring-boot-devtools'
+//	implementation 'org.springframework.boot:spring-boot-devtools'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'

src/main/java/com/gaotao/modules/api/entity/IfsShopOrder.java

@@ -0,0 +1,69 @@
+package com.gaotao.modules.api.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Alias("IfsShopOrder")
+public class IfsShopOrder {
+    private String site;
+    @JsonProperty("orderNo")
+    private String orderNo;
+
+    @JsonProperty("releaseNo")
+    private String releaseNo;
+
+    @JsonProperty("sequenceNo")
+    private String sequenceNo;
+
+    @JsonProperty("contract")
+    private String contract;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("partNo")
+    private String partNo;
+
+    @JsonProperty("partDesc")
+    private String partDesc;
+
+    @JsonProperty("lotSize")
+    private BigDecimal lotSize;
+
+    @JsonProperty("uom")
+    private String uom;
+
+    @JsonProperty("startDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    @JsonProperty("finishDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date finishDate;
+
+    @JsonProperty("needDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date needDate;
+
+    @JsonProperty("closeCode")
+    private String closeCode;
+
+    @JsonProperty("closeTolerance")
+    private BigDecimal closeTolerance;  // 推荐使用 BigDecimal 避免浮点精度问题
+
+    @JsonProperty("qtyComplete")
+    private BigDecimal qtyComplete;     // 同上，即使当前是整数，未来可能有小数
+
+    @JsonProperty("objstate")
+    private String objstate;
+}

src/main/java/com/gaotao/modules/api/service/IfsApiService.java

@@ -0,0 +1,15 @@
+package com.gaotao.modules.api.service;
+
+import com.gaotao.modules.api.entity.IfsShopOrder;
+import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+public interface IfsApiService {
+
+    List<IfsShopOrder> getShopOrderFromIFSWithOrderNo(IfsShopOrder data)throws Exception;
+
+    // List<ShopOrderMaterialVo> getSOSBOMForIssureNew(SOScheduledRoutingData data);
+}

src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java

@@ -0,0 +1,44 @@
+package com.gaotao.modules.api.service.impl;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gaotao.common.utils.HttpUtils;
+import com.gaotao.modules.api.entity.IfsShopOrder;
+import com.gaotao.modules.api.service.IfsApiService;
+import com.gaotao.modules.base.entity.SOScheduledRoutingData;
+import com.gaotao.modules.notify.entity.vo.ShopOrderVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class IfsApiServiceImpl implements IfsApiService {
+    @Value("${custom.ifs-url}")
+    private String ifsUrl;
+
+    private static final String ifsDBName="IFST";
+    private static final String domainUserID="CCL_WMS";
+    @Override
+    public List<IfsShopOrder> getShopOrderFromIFSWithOrderNo(IfsShopOrder data)throws Exception {
+        Map<String, Object> params = Map.of(
+                "ifsDBName", ifsDBName,
+                "domainUserID", domainUserID,
+                "ifsSiteID", data.getSite(),
+                "ifsOrderNo", data.getOrderNo(),
+                "ifsReleaseNo", data.getReleaseNo(),
+                "ifsSequenceNo", data.getSequenceNo()
+        );
+        ObjectMapper objectMapper = new ObjectMapper();
+        String jsonBody = objectMapper.writeValueAsString(params);
+        String ifsResponse = HttpUtils.doGetWithBody(ifsUrl+"ShopOrder",jsonBody,null);
+        ObjectMapper mapper = new ObjectMapper();
+        List<IfsShopOrder> result = mapper.readValue(ifsResponse, new TypeReference<List<IfsShopOrder>>() {
+        });
+
+        return result;
+    }
+}

src/main/java/com/gaotao/modules/notify/controller/NewIssureController.java

@@ -0,0 +1,37 @@
+package com.gaotao.modules.notify.controller;
+
+import com.gaotao.common.utils.R;
+import com.gaotao.modules.api.entity.IfsShopOrder;
+import com.gaotao.modules.api.service.IfsApiService;
+import com.gaotao.modules.base.entity.SOScheduledRoutingData;
+import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
+import com.gaotao.modules.notify.service.NewIssureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+@RestController
+@RequestMapping("orderIssure/newIssure")
+public class NewIssureController {
+    @Autowired
+    private IfsApiService ifsApiService;
+
+    @Autowired
+    private NewIssureService newIssureService;
+
+    @PostMapping(value="/getShopOrderFromIFSWithOrderNo")
+    @ResponseBody
+    public R getShopOrderFromIFSWithOrderNo(@RequestBody IfsShopOrder data) throws Exception{
+        //TODO 调用rifs接口获取列表数据
+        List<IfsShopOrder> rows  = ifsApiService.getShopOrderFromIFSWithOrderNo(data);
+        return R.ok().put("rows", rows);
+    }
+
+
+    // @PostMapping(value="/getSOSBOMForIssureNew")
+    // @ResponseBody
+    // public R getSOSBOMForIssureNew(@RequestBody SOScheduledRoutingData data) throws Exception{
+    //     List<ShopOrderMaterialVo> rows  = newIssureService.getSOSBOMForIssureNew(data);
+    //     return R.ok().put("rows", rows);
+    // }
+}

src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java

@@ -2,6 +2,7 @@ package com.gaotao.modules.notify.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -60,5 +61,9 @@ public class SOIssueNotifyOrderList implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date needDate;
     private String locationNo;
+
+    private String releaseNo;
+
+    private String sequenceNo;
 }
 

src/main/java/com/gaotao/modules/notify/service/NewIssureService.java

@@ -0,0 +1,4 @@
+package com.gaotao.modules.notify.service;
+
+public interface NewIssureService {
+}

src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java

@@ -0,0 +1,9 @@
+package com.gaotao.modules.notify.service.impl;
+
+import com.gaotao.modules.notify.service.NewIssureService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NewIssureServiceImpl implements NewIssureService {
+
+}

src/main/resources/mapper/notify/IssureNotifyMapper.xml

@@ -26,6 +26,7 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
 
     <select id="getNotifyNoDetail" resultType="SOIssueNotifyOrderListData">
         select a.notify_no,a.site,a.item_no,a.fgpart_no,a.soorder_no,a.ops_item_no,a.seq_no,a.issure_qty,a.out_work_order_flag,a.location_no,a.need_date
+        ,a.release_no,a.sequence_no
         from SOIssueNotifyOrderList a
         where a.site=#{site} and a.notify_no=#{notifyNo}
     </select>
@@ -127,9 +128,9 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
     </select>
 
     <insert id="saveSOIssueNotifyOrderList">
-        insert into SOIssueNotifyOrderList(notify_no,site,item_no,fgpart_no,soorder_no,ops_item_no,seq_no,issure_qty,out_work_order_flag,location_no,need_date)
-        values(#{notifyNo},#{site},#{itemNo},#{fgPartNo},#{soorderNo},#{opsItemNo},#{seqNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag}
-        ,#{locationNo},#{needDate})
+        insert into SOIssueNotifyOrderList(notify_no,site,item_no,fgpart_no,soorder_no,issure_qty,out_work_order_flag,need_date,release_no,sequence_no)
+        values(#{notifyNo},#{site},#{itemNo},#{fgPartNo},#{soorderNo},#{issureQty,jdbcType=DECIMAL},#{outWorkOrderFlag}
+        ,#{needDate},#{releaseNo},#{sequenceNo})
     </insert>
     <delete id="deleteSOIssueNotifyOrderMaterialListData">
        delete from SOIssueNotifyOrderMaterialList where site=#{site} and notify_no=#{notifyNo} and item_no=#{itemNo}