优化

src/main/java/com/jeesite/modules/mes/api/MesProductRecordControllerApi.java

@@ -2,15 +2,13 @@ package com.jeesite.modules.mes.api;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.modules.file.utils.FileUploadUtils;
 import com.jeesite.modules.mes.entity.MesLine;
 import com.jeesite.modules.mes.entity.MesLineProcess;
 import com.jeesite.modules.mes.entity.MesProductRecord;
 import com.jeesite.modules.mes.resp.CommonResp;
 import com.jeesite.modules.mes.resp.ParamsResp;
-import com.jeesite.modules.mes.service.MesLineProcessService;
-import com.jeesite.modules.mes.service.MesLineService;
-import com.jeesite.modules.mes.service.MesProductCateService;
-import com.jeesite.modules.mes.service.MesProductRecordService;
+import com.jeesite.modules.mes.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
@@ -50,7 +48,8 @@ public class MesProductRecordControllerApi {
     @ResponseBody
     public CommonResp save(@Validated MesProductRecord mesProductRecord, HttpServletRequest request) {
         CommonResp<String> resp = new CommonResp<>();
-
+        String remark = request.getParameter("remark");
+        String mesProductRecord_image = request.getParameter("mesProductRecord_image");
         if(mesProductRecord.getIsNewRecord() && mesProductRecord.getLineSn().isEmpty()){ // 新增
                 resp.setResult(Global.FALSE);
                 resp.setMessage("产线编号不能为空！");
@@ -96,8 +95,12 @@ public class MesProductRecordControllerApi {
             mesProductRecord.setLineSn(mesLineProcess1.getLineSn());
             mesProductRecord.setCateSn(cateSn);
 
-            mesProductRecordService.add(mesProductRecord,params,null);
 
+            mesProductRecordService.add(mesProductRecord,params,null,remark);
+            if (mesProductRecord_image!=null){
+                MesProductRecord info = mesProductRecordService.findInfo(mesProductRecord);
+                FileUploadUtils.saveFileUpload(info, info.getId(), "mesProductRecord_image");
+            }
         }catch (Exception e){
             e.printStackTrace();
             resp.setResult(Global.FALSE);

src/main/java/com/jeesite/modules/mes/service/MesProductRecordService.java

@@ -303,7 +303,7 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 	 * @param mesProductRecord
 	 */
 	@Transactional
-	public String add(MesProductRecord mesProductRecord,List<ParamsResp> params,List<BindMaterialResp> bmlists) {
+	public String add(MesProductRecord mesProductRecord,List<ParamsResp> params,List<BindMaterialResp> bmlists,String remark) {
 		if(mesProductRecord.getIsNewRecord()){ // 新增
 
 			String cateSn = mesProductRecord.getCateSn();
@@ -341,11 +341,15 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 						mpr1.setOprno(mesProductRecord.getOprno());
 					}
 					mpr1.setContent(mesProductRecord.getContent());
+					if (remark != null){
+						mpr1.setRemark(remark);
+					}
 
 					for(ParamsResp paramsResp:params){
 						if(mesTemplateItems.getCraft().equals(paramsResp.getCraft())){
 							mpr1.setMaterielSn(paramsResp.getVal());
 							mpr1.setContent(paramsResp.getResult());
+
 							break;
 						}
 					}

src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -473,7 +473,7 @@ public class MesProductRecordController extends BaseController {
 			mesProductRecord.setLineSn(mesLineProcess1.getLineSn());
 			mesProductRecord.setCateSn(cateSn);
 
-			mesProductRecordService.add(mesProductRecord,params,null);
+			mesProductRecordService.add(mesProductRecord,params,null,null);
 		}catch (Exception e){
 			e.printStackTrace();
 			return renderResult(Global.FALSE, text("操作失败！"+e.getMessage()));
@@ -778,7 +778,7 @@ public class MesProductRecordController extends BaseController {
 				}
 			}
 
-			ret = mesProductRecordService.add(mesProductRecord,params,bmlists);
+			ret = mesProductRecordService.add(mesProductRecord,params,bmlists,null);
 		}catch (Exception e){
 			e.printStackTrace();
 			ret = "RSNS";
@@ -874,7 +874,7 @@ public class MesProductRecordController extends BaseController {
 				}
 			}
 
-			ret = mesProductRecordService.add(mesProductRecord,params,bmlists);
+			ret = mesProductRecordService.add(mesProductRecord,params,bmlists,null);
 		}catch (Exception e){
 			e.printStackTrace();
 			ret = "RSNS";
@@ -1098,7 +1098,7 @@ public class MesProductRecordController extends BaseController {
 							mesProductRecord.setCateSn(cateSn);
 							List<ParamsResp> params = new ArrayList<>();
 							List<BindMaterialResp> bmlists = new ArrayList<>();
-							mesProductRecordService.add(mesProductRecord,params,bmlists);
+							mesProductRecordService.add(mesProductRecord,params,bmlists,null);
 						}
 					}
 				}
@@ -3037,7 +3037,7 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 					try{
 						List<ParamsResp> params = new ArrayList<>();
 						List<BindMaterialResp> bmlists = new ArrayList<>();
-						ret = mesProductRecordService.add(mesProductRecord,params,bmlists);
+						ret = mesProductRecordService.add(mesProductRecord,params,bmlists,null);
 					}catch (Exception e){
 						e.printStackTrace();
 						ret = "RSNS";

src/main/resources/views/modules/mes/mesProductRecordInfo.html

@@ -41,6 +41,13 @@
 					<td>${mesProductRecord.content}</td>
 				</tr>
 				<tr>
+					<th class="mpc-header">图片</th>
+					<td>
+						<#form:fileupload id="uploadImage" bizKey="${mesProductRecord.id}" bizType="mesProductRecord_image"
+						uploadType="image" class="" readonly="true" preview="true"/>
+					</td>
+				</tr>
+				<tr>
 					<th class="mpc-header">备注</th>
 					<td>${mesProductRecord.remark}</td>
 				</tr>
@@ -66,4 +73,4 @@
 <% } %>
 <script>
 
-</script>
+</script>