修改生产加工单计划用量和实际用量取数显示

.idea/dataSources.local.xml

@@ -2,14 +2,9 @@
 <project version="4">
   <component name="dataSourceStorageLocal">
     <data-source name="mt_erp@47.96.183.77" uuid="b3cb0d92-041d-41fc-ace7-4cc9410e1df1">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" />
       <secret-storage>master_key</secret-storage>
       <user-name>root</user-name>
-      <schema-mapping>
-        <introspection-scope>
-          <node kind="schema" qname="" />
-        </introspection-scope>
-      </schema-mapping>
     </data-source>
   </component>
 </project>

.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.deer:wms-intercept:1.0.0-SNAPSHOT">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.deer:wms-project-seed:1.0.0-SNAPSHOT">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

wms-parent.iml

@@ -89,7 +89,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/jconsole.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -98,7 +98,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/tools.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java

@@ -1,7 +1,6 @@
 package com.deer.wms.produce.manage;
 
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -15,6 +14,10 @@ import org.springframework.context.annotation.ComponentScan;
 })
 public class PmsApplication {
     public static void main(String[] args) {
+        String aa[] = new String[]{"11","22"};
+        for (int i = 0; i < aa.length; i++) {
+            System.out.println("=="+aa[i]);
+        }
         SpringApplication.run(PmsApplication.class, args);
     }
 

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml

@@ -36,7 +36,8 @@
         <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
         <result column="code" jdbcType="VARCHAR" property="code" />
         <result column="specification" jdbcType="VARCHAR" property="specification" />
-        <result column="dosage" jdbcType="REAL" property="dosage" />
+        <result column="plan_dosage" jdbcType="REAL" property="planDosage" />
+        <result column="real_dosage" jdbcType="REAL" property="realDosage" />
         <result column="unit_id" jdbcType="INTEGER" property="unitId" />
         <result column="memo" jdbcType="VARCHAR" property="memo" />
         <result column="company_id" jdbcType="INTEGER" property="companyId" />

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java

@@ -186,7 +186,7 @@ public class MaterialsInfoController {
         }catch (Exception e){
             ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常","null");
         }
-        PageInfo pageInfo = new PageInfo(list);;
+        PageInfo pageInfo = new PageInfo(list);
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java

@@ -127,7 +127,7 @@ public class ProcessBomController {
     }
 
     /**
-     * hy
+     * hy弃用
      * 根据选择的产品名称来展示产品其他数据和工序数据,
      * 用于新建生产加工产品bom下拉框选择
      * @param params
@@ -166,11 +166,11 @@ public class ProcessBomController {
     })
     @GetMapping("/and/product/bom/by/prodbom")
     public Result ProductAndProcessBomByProdBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){
-        if(currentUser==null){
+        //if(currentUser==null){
-            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        //    return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
-        }
+        //}
 
-        params.setCompanyId(currentUser.getCompanyId());
+        params.setCompanyId(1);
         ProductProcessBomPo productProcessBomPo = processBomService.findProductAndProcessBomByProdBom(params);
         return ResultGenerator.genSuccessResult(productProcessBomPo);
     }