文件上传问题

op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java

@@ -22,6 +22,7 @@ public class MesPrepare extends BaseEntity {
 	/** 工单编码 */
 	@Excel(name = "工单编码")
 	private String workorderCode;
+	private String workorderCodeSap;
 
 	/** 工单名称 */
 	@Excel(name = "工单名称")
@@ -122,6 +123,14 @@ public class MesPrepare extends BaseEntity {
 
 	private String dayStr;
 
+	public String getWorkorderCodeSap() {
+		return workorderCodeSap;
+	}
+
+	public void setWorkorderCodeSap(String workorderCodeSap) {
+		this.workorderCodeSap = workorderCodeSap;
+	}
+
 	public String getDayStr() {
 		return dayStr;
 	}

op-modules/op-mes/src/main/resources/mapper/MesPrepareMapper.xml

@@ -103,9 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<!--T+1天的母单-->
     <select id="getParentWorkOrderT1" resultType="com.op.mes.domain.MesPrepare">
-		select workorder_code workorderCode
+		select workorder_code workorderCode,
+			   workorder_code_sap workorderCodeSap
 		from pro_order_workorder
-		where parent_order = '0' and prod_type = 'prod'
+		where parent_order = '0' and prod_type != 'white'
 		and CONVERT(varchar(100), product_date, 23) = #{dayStr}
 	</select>
 

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java

@@ -147,6 +147,16 @@ public class ProOrderWorkorder extends TreeEntity {
 
     private String prepareId;
 
+    private String workorderCodeSap;
+
+    public String getWorkorderCodeSap() {
+        return workorderCodeSap;
+    }
+
+    public void setWorkorderCodeSap(String workorderCodeSap) {
+        this.workorderCodeSap = workorderCodeSap;
+    }
+
     public String getPrepareId() {
         return prepareId;
     }

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java

@@ -123,9 +123,10 @@ public class SapProRouteServiceImpl implements SapProRouteService {
     @DS("#header.poolName")
     public int updateProRoute(SapProRoute proRoute) {
         proRoute.setUpdateTime(DateUtils.getNowDate());
+        baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId());
         //上传附件
         if (StringUtils.isNotEmpty(proRoute.getFileList())) {
-            baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId());
+
             String[] ids = proRoute.getFileList().split(",");
             List<BaseFileData> files = new ArrayList<>();
             BaseFileData file = null;

op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java

@@ -141,10 +141,10 @@ public class ProProcessServiceImpl implements IProProcessService {
     @Override
     @DS("#header.poolName")
     public int updateProProcess(ProProcess proProcess) {
-
+        baseFileMapper.deleteBaseFileBySourceId(proProcess.getProcessId());
         //上传附件
         if (StringUtils.isNotEmpty(proProcess.getFileList())) {
-            baseFileMapper.deleteBaseFileBySourceId(proProcess.getProcessId());
+
             String[] ids = proProcess.getFileList().split(",");
             List<BaseFileData> files = new ArrayList<>();
             BaseFileData file = null;

op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRecipeServiceImpl.java

@@ -139,10 +139,10 @@ public class ProRecipeServiceImpl implements IProRecipeService {
     @Override
     @DS("#header.poolName")
     public int updateProRecipe(ProRecipe proRecipe) {
-
+        baseFileMapper.deleteBaseFileBySourceId(proRecipe.getRecipeId());
         //上传附件
         if (StringUtils.isNotEmpty(proRecipe.getFileList())) {
-            baseFileMapper.deleteBaseFileBySourceId(proRecipe.getRecipeId());
+
             String[] ids = proRecipe.getFileList().split(",");
             List<BaseFileData> files = new ArrayList<>();
             BaseFileData file = null;

op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProRouteServiceImpl.java

@@ -123,9 +123,10 @@ public class ProRouteServiceImpl implements IProRouteService {
     @DS("#header.poolName")
     public int updateProRoute(ProRoute proRoute) {
         proRoute.setUpdateTime(DateUtils.getNowDate());
+        baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId());
         //上传附件
         if (StringUtils.isNotEmpty(proRoute.getFileList())) {
-            baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId());
+
             String[] ids = proRoute.getFileList().split(",");
             List<BaseFileData> files = new ArrayList<>();
             BaseFileData file = null;