# 提交环境配置

.gitignore

+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+application-druid.yml
\ No newline at end of file

admin/Dockerfile

@@ -27,4 +27,4 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 COPY target/admin.jar /topsun/mes/mes-admin.jar
 
 # 容器启动时执行（类似CMD）
-ENTRYPOINT ["java","-Dspring.profiles.active=test", "-jar", "/topsun/mes/mes-admin.jar"]
+#ENTRYPOINT ["java","-Dspring.profiles.active=test", "-jar", "/topsun/mes/mes-admin.jar"]

admin/src/main/resources/application-prod.yml

@@ -216,7 +216,7 @@ minio:
   url: http://192.168.3.91:9000
   accessKey: minioadmin
   secretKey: minioadmin
-  bucketName: mes
+  bucketName: mes-prod
 
 #远程连接SAP
 remote:

common/src/main/java/com/bsn/common/utils/file/MimeTypeUtils.java

@@ -29,7 +29,7 @@ public class MimeTypeUtils {
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
-            "rar", "zip", "gz", "bz2", "apk",
+            "rar", "zip", "gz", "bz2", "apk","wgt",
             // 视频格式
             "mp4", "avi", "rmvb",
             // pdf

mes/src/main/java/com/bsn/mes/pro/mapper/ProStartWorkMapper.java

@@ -21,7 +21,7 @@ public interface ProStartWorkMapper extends BaseMapper<ProStartWork> {
      * @param startWorkId 开始作业记录表主键
      * @return 开始作业记录表
      */
-    ProStartWork selectProStartWorkByStartWorkId(Long startWorkId);
+    ProStartWork getObjByStartWorkId(Long startWorkId);
 
     /**
      * 查询开始作业记录表列表

mes/src/main/java/com/bsn/mes/pro/mapper/proWorkOrder/ProWorkOrderBomMapper.java

@@ -81,9 +81,6 @@ public interface ProWorkOrderBomMapper extends BaseMapper<ProWorkOrderBom> {
     @Delete("delete from pro_work_order_bom where workorder_code = #{workorderCode}")
     void deleteByWorkorderCode(@Param("workorderCode") String workorderCode);
 
-    @Select(value = "select DISTINCT t2.item_id,t2.item_code,t2.item_name,t2.specification,t2.item_type_name,t2.unit_of_measure from pro_work_order_bom t1 left join md_item t2 on t1.item_id = t2.item_id ${ew.customSqlSegment}")
-    List<ProWorkOrderBomVo> selectProWorkOrderBomJoinItem(@Param("ew") QueryWrapper<ProWorkOrderBomVo> query);
-
 
     @Delete(value = "delete from pro_work_order_bom  ${ew.customSqlSegment}")
     void deleteProWorkOrderBom(@Param("ew") QueryWrapper<ProWorkOrderBom> queryWrapper);

mes/src/main/java/com/bsn/mes/pro/service/impl/ProStartWorkServiceImpl.java

@@ -55,7 +55,7 @@ public class ProStartWorkServiceImpl implements IProStartWorkService {
      */
     @Override
     public ProStartWork selectProStartWorkByStartWorkId(Long startWorkId) {
-        return proStartWorkMapper.selectProStartWorkByStartWorkId(startWorkId);
+        return proStartWorkMapper.getObjByStartWorkId(startWorkId);
     }
 
     /**

mes/src/main/resources/mapper/pro/ProStartWorkMapper.xml

@@ -59,7 +59,7 @@
         </where>
     </select>
 
-    <select id="selectProStartWorkByStartWorkId" parameterType="Long" resultMap="ProStartWorkResult">
+    <select id="getObjByStartWorkId" parameterType="Long" resultMap="ProStartWorkResult">
         <include refid="selectProStartWorkVo"/>
         where start_work_id = #{startWorkId}
     </select>