代码生成提交

.idea/encodings.xml

@@ -4,5 +4,6 @@
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/wms-produce-manage" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/wms-produce-manage/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/wms-produce-manage/src/test/java/generator/CodeGenerator.java" charset="UTF-8" />
   </component>
 </project>

.idea/workspace.xml

@@ -3,29 +3,22 @@
   <component name="AnalysisUIOptions">
     <option name="GROUP_BY_SEVERITY" value="true" />
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-parent.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfoParams.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfoParams.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavCloth.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/test/java/BillCodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/test/java/BillCodeGenerator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavClothParams.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByOrderInfoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByProductInfoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByWeavClothService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByOrderInfoServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByProductInfoServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByWeavClothServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -302,9 +295,9 @@
     <list>
       <item itemvalue="Application.ProduceManagePublicMethod" />
       <item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
-      <item itemvalue="Spring Boot.PmsApplication" />
       <item itemvalue="Application.CodeGenerator" />
       <item itemvalue="Application.CodeGenerator (1)" />
+      <item itemvalue="Spring Boot.PmsApplication" />
     </list>
     <recent_temporary>
       <list>
@@ -556,9 +549,10 @@
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
     <state x="513" y="309" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597710642111" />
-    <state x="389" y="39" key="CommitChangelistDialog2" timestamp="1597717639469">
+    <state x="389" y="0" key="CommitChangelistDialog2" timestamp="1597718387821">
-      <screen x="0" y="0" width="1920" height="1050" />
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state x="389" y="0" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1597718387821" />
     <state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717639469" />
     <state x="621" y="200" key="FileChooserDialogImpl" timestamp="1597653593780">
       <screen x="0" y="0" width="1920" height="1050" />

wms-parent.iml

@@ -95,7 +95,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_221/lib/jconsole.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -104,7 +104,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_221/lib/tools.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java

@@ -1,6 +1,11 @@
 package com.deer.wms.produce.clothflow.dao;
 
 import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo;
+import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfoParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
 
 public interface MtAloneByOrderInfoMapper extends Mapper<MtAloneByOrderInfo> {
+    List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java

@@ -1,6 +1,11 @@
 package com.deer.wms.produce.clothflow.dao;
 
 import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo;
+import com.deer.wms.produce.clothflow.model.MtAloneByProductInfoParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
 
 public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo> {
+    List<MtAloneByProductInfo> findList(MtAloneByProductInfoParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java

@@ -1,6 +1,11 @@
 package com.deer.wms.produce.clothflow.dao;
 
 import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth;
+import com.deer.wms.produce.clothflow.model.MtAloneByWeavClothParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
 
 public interface MtAloneByWeavClothMapper extends Mapper<MtAloneByWeavCloth> {
+    List<MtAloneByWeavCloth> findList(MtAloneByWeavClothParams params);
 }

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

@@ -28,4 +28,8 @@
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_order_info
+  </select>
 </mapper>

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

@@ -34,4 +34,9 @@
     <result column="deliver_goods" jdbcType="INTEGER" property="deliverGoods" />
     <result column="complete" jdbcType="INTEGER" property="complete" />
   </resultMap>
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_product_info
+  </select>
 </mapper>

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

@@ -28,4 +28,9 @@
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_weav_cloth
+  </select>
 </mapper>

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

@@ -53,7 +53,7 @@ public class MtAloneByOrderInfoController {
     @ApiOperation(value = "删除xxx", notes = "删除xxx")
     @DeleteMapping("/delete/{id}")
     public Result delete(@PathVariable Integer Id) {
-        mtAloneByOrderInfoService.deleteById(mtAloneByOrderInfoId);
+        mtAloneByOrderInfoService.deleteById(Id);
         return ResultGenerator.genSuccessResult();
     }
     

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

@@ -53,7 +53,7 @@ public class MtAloneByProductInfoController {
     @ApiOperation(value = "删除xxx", notes = "删除xxx")
     @DeleteMapping("/delete/{id}")
     public Result delete(@PathVariable Integer Id) {
-        mtAloneByProductInfoService.deleteById(mtAloneByProductInfoId);
+        mtAloneByProductInfoService.deleteById(Id);
         return ResultGenerator.genSuccessResult();
     }
     

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

@@ -53,7 +53,7 @@ public class MtAloneByWeavClothController {
     @ApiOperation(value = "删除xxx", notes = "删除xxx")
     @DeleteMapping("/delete/{id}")
     public Result delete(@PathVariable Integer Id) {
-        mtAloneByWeavClothService.deleteById(mtAloneByWeavClothId);
+        mtAloneByWeavClothService.deleteById(Id);
         return ResultGenerator.genSuccessResult();
     }
     

wms-produce-manage/src/test/java/BillCodeGenerator.java

@@ -22,7 +22,7 @@ public class BillCodeGenerator {
         configurer.setModuleName("/wms-ware-task");
 
         //设置需要生成的表
-         configurer.getTables().add(new Table("mt_alone_product_batch_detect",null,"id","Integer"));
+        configurer.getTables().add(new Table("mt_alone_product_batch_detect",null,"id","Integer"));
 
         //生成代码
         Generator.genCode(configurer);