Browse Source

包装任务不生成货值单价

hxx 2 days ago
parent
commit
0c7c73da2d

+ 8 - 0
.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

+ 18 - 0
.idea/compiler.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="ltc-eastar" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="ltc-eastar" options="-parameters" />
+    </option>
+  </component>
+</project>

+ 6 - 0
.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>

+ 35 - 0
.idea/jarRepositories.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="central" />
+      <option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="repo-hfvom" />
+      <option name="name" value="repo-hfvom" />
+      <option name="url" value="https://packages.aliyun.com/68552ca333ca8867a43507dd/maven/repo-hfvom" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="snapshots" />
+      <option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+  </component>
+</project>

+ 12 - 0
.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>

+ 6 - 0
.idea/vcs.xml

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

+ 6 - 7
src/main/java/com/malk/eastar/service/impl/EastarTbServiceImpl.java

@@ -255,7 +255,7 @@ public class EastarTbServiceImpl  implements EastarTbService {
             if(isLang){ // 区分语言
                 result=saveTbTask(taskMap,orderLangConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
             }else{
-                result=saveTbTask(taskMap,xlConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
+                result=saveTbTask(taskMap,orderLangConf,map,customfields,isLang,sonconf,sonScenariofieldconfigId,gysName,pId,pMainId,skuIdMap);
             }
             if(gysOrderData.containsKey(gysName)){
                 gysOrderData.get(gysName).addAll(result);
@@ -348,8 +348,7 @@ public class EastarTbServiceImpl  implements EastarTbService {
             Map packTask = UtilMap.map(
                     "textField_mecmytpr, textField_mifp03eo, textField_mjr129o4, selectField_me2f7tw4, numberField_mkosp94h, numberField_mifp03el, " +
                             "numberField_mmmwu4cg, " + //研发部订单需求数量 add by Jason 20260312
-                            "numberField_mmmwu4ci, " + //总采购数量 add by Jason 20260312
-                            "numberField_me2f7tw0",
+                            "numberField_mmmwu4ci, ", //总采购数量 add by Jason 20260312
                     UtilMap.getString(orderMap, "textField_mizmmf8k"),
                     UtilMap.getString(orderMap, "textField_mizmmf8j"),
                     UtilMap.getString(orderMap, "textField_meqqj4wb"),
@@ -357,8 +356,8 @@ public class EastarTbServiceImpl  implements EastarTbService {
                     setsValue,
                     setsValue,
                     0, //研发部订单需求数量 add by Jason 20260312
-                    0, //总采购数量 add by Jason 20260312
-                    UtilMap.getString(orderMap, "numberField_mkf4bc4j")
+                    0 //总采购数量 add by Jason 20260312
+
             );
             packOrderData.computeIfAbsent(supplier, k -> new ArrayList<>()).add(packTask);
         }
@@ -442,11 +441,11 @@ public class EastarTbServiceImpl  implements EastarTbService {
                             "textField_mecmytpr, textField_mecmytps, textField_mecmytpt, numberField_mifp03el, " +
                                     "numberField_mmmwu4cg, " + //研发部订单需求数量 add by Jason 20260312
                                     "numberField_mmmwu4ci, " + //总采购数量 add by Jason 20260312
-                                    "textField_mifp03eo, textField_miib17jx, textField_mizvc5oj, textField_mjr129o4, numberField_mkosp94h",
+                                    "textField_mifp03eo, textField_miib17jx, textField_mizvc5oj, textField_mjr129o4, numberField_mkosp94h, numberField_me2f7tw0",
                             result.get("content"),result.get("taskId"),"未开始",value,
                             rdNum, //研发部订单需求数量 add by Jason 20260312
                             allSupplyNum, //总采购数量 add by Jason 20260312
-                            sku,pId,result.get("taskId"),lang,value));
+                            sku,pId,result.get("taskId"),lang,value,UtilMap.getString(map, "numberField_mkf4bc4j")));
             recodTable.add(recod);
 //            for (String son:sonconf){
 //                Map sonMap=new HashMap();

+ 1 - 1
src/test/java/TbTest.java

@@ -57,7 +57,7 @@ public class TbTest {
 
     @Test
     public void createTask() {
-        Map map=eastarTbService.createTask("90552600-4540-4352-88bf-e8377aaafe66");
+        Map map=eastarTbService.createTask("3b83493f-2e4f-429e-a71d-999228e23981");
     }
 
     @Autowired