wilson
/
rongxing-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

消息提示多语言 schedule 2023年1月29日 sxm

master
[li_she] 3 years ago
parent
33a4410e82
commit
d299413ee6
4 changed files with 193 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 177
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 80
      src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
  3. 95
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  4. 21
      src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java

177
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
View File

@ -1,7 +1,7 @@
package com.gaotao.modules.schedule.controller;
import com.gaotao.common.annotation.RepeatSubmit;
import com.gaotao.common.exception.ResponseEnum;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.utils.R;
import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
import com.gaotao.modules.schedule.data.*;
@ -11,6 +11,7 @@ import com.gaotao.modules.schedule.data.dto.ShopOrderRollDto;
import com.gaotao.modules.schedule.data.dto.WorkbenchPostinspection;
import com.gaotao.modules.schedule.service.ScheduleService;
import com.gaotao.modules.shopOrder.entity.OperatorData;
import com.gaotao.modules.sys.controller.AbstractController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -28,7 +29,7 @@ import java.util.Map;
**/
@RestController
@RequestMapping(value = "/schedule")
public class ScheduleController {
public class ScheduleController extends AbstractController {
@Autowired
private ScheduleService scheduleService;
@ -46,7 +47,7 @@ public class ScheduleController {
Map<String, Object> calendarMap = scheduleService.getCalendarIdByResourceId(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("calendarRow", calendarMap)
.put("rows", resultList)
.put("total", resultList.size());
@ -65,7 +66,7 @@ public class ScheduleController {
// Float requireScheduleTime = scheduleService.getRequireScheduleTime(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
//.put("requireScheduleTime", requireScheduleTime)
.put("rows", resultList)
.put("total", resultList.size());
@ -83,7 +84,7 @@ public class ScheduleController {
List<ScheduleData> resultList = scheduleService.getOrderScheduleList(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -100,7 +101,7 @@ public class ScheduleController {
List<ScheduleData> resultList = scheduleService.getProduceScheduleData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -117,7 +118,7 @@ public class ScheduleController {
List<OperatorData> resultList = scheduleService.getOperatorList(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -134,7 +135,7 @@ public class ScheduleController {
OperatorOutData result = scheduleService.getOperatorData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -150,7 +151,7 @@ public class ScheduleController {
ScheduleData result = scheduleService.getScheduleDataBySeqNo(seqNo);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -166,7 +167,7 @@ public class ScheduleController {
SfdcRollOpsData result = scheduleService.getCurrentRollOpsBySeqNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -182,7 +183,7 @@ public class ScheduleController {
List<SfdcTimeData> resultList = scheduleService.getSfdcTimeByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -199,7 +200,7 @@ public class ScheduleController {
List<ToolInstanceData> resultList = scheduleService.getOrderToolByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -216,7 +217,7 @@ public class ScheduleController {
List<SfdcToolData> resultList = scheduleService.getSfdcToolByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -233,7 +234,7 @@ public class ScheduleController {
List<OrderBomData> resultList = scheduleService.getOrderBomByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -250,7 +251,7 @@ public class ScheduleController {
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -267,7 +268,7 @@ public class ScheduleController {
List<SfdcRollOpsData> resultList = scheduleService.getSfdcRollOpsByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -284,7 +285,7 @@ public class ScheduleController {
List<SfdcDefectData> resultList = scheduleService.getSfdcDefectByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -301,7 +302,7 @@ public class ScheduleController {
List<SfdcRollData> resultList = scheduleService.getSfdcRollByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -318,7 +319,7 @@ public class ScheduleController {
List<SfdcData> resultList = scheduleService.getSfdcDataByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -335,7 +336,7 @@ public class ScheduleController {
Float reportedQty = scheduleService.getSfdcRollReportedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("reportedQty", reportedQty);
}
@ -351,7 +352,7 @@ public class ScheduleController {
Integer countNums = scheduleService.countSfdcRollByRollNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("countNums", countNums);
}
@ -367,7 +368,7 @@ public class ScheduleController {
Float defectedQty = scheduleService.getSfdcDefectDefectedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("defectedQty", defectedQty);
}
@ -383,7 +384,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.countSfdcTimeQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -399,7 +400,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getSfdcTimeMaxAndMinTime(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -415,7 +416,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getSfdcRollOpsReportedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -431,7 +432,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getCurrentRollReportedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -447,7 +448,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getScheduleShiftData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -463,7 +464,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getSfdcTimeData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -479,7 +480,7 @@ public class ScheduleController {
SfdcData result = scheduleService.getSfdcReportedData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -495,7 +496,7 @@ public class ScheduleController {
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialByRollNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -512,7 +513,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.refreshWorkPlatformButtons(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -528,7 +529,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkScheduleButton(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -545,7 +546,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -562,7 +563,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -579,7 +580,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -609,7 +610,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -624,7 +625,7 @@ public class ScheduleController {
List<SfdcDefectData> resultList = scheduleService.getScheduleDefectHist(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -656,7 +657,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -687,7 +688,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -702,7 +703,7 @@ public class ScheduleController {
List<Map<String, Object>> resultList = scheduleService.getBomItemNosByPartNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -718,7 +719,7 @@ public class ScheduleController {
List<Map<String, Object>> resultList = scheduleService.getBomItemNosByKeyPartNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -749,7 +750,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -766,7 +767,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -796,7 +797,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -813,7 +814,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -830,7 +831,7 @@ public class ScheduleController {
.put("code", 200)
.put("usedQty", usedQty)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -861,7 +862,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -892,7 +893,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -924,7 +925,7 @@ public class ScheduleController {
.put("code", 200)
.put("success", true)
.put("rollNo", rollNo)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -953,7 +954,7 @@ public class ScheduleController {
List<SfdcTimeData> resultList = scheduleService.getSfdcTimeHistBySeqNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -969,7 +970,7 @@ public class ScheduleController {
List<SfdcToolData> resultList = scheduleService.getSfdcToolHistBySeqNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -985,7 +986,7 @@ public class ScheduleController {
List<SfdcMaterialData> resultList = scheduleService.getSfdcMaterialHistBySeqNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList);
}
@ -1001,7 +1002,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkFinishScheduleWithNoFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
/**
@ -1017,7 +1018,7 @@ public class ScheduleController {
scheduleService.finishScheduleWithNoFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1032,7 +1033,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkCuttingMaterial(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1050,7 +1051,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1065,7 +1066,7 @@ public class ScheduleController {
scheduleService.reopenSfdcRolls(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1080,7 +1081,7 @@ public class ScheduleController {
scheduleService.deleteSfdcRolls(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1095,7 +1096,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkSwitchSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1112,7 +1113,7 @@ public class ScheduleController {
scheduleService.switchSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1127,7 +1128,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkCreateSplitSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1145,7 +1146,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1160,7 +1161,7 @@ public class ScheduleController {
Map<String, Object> resultRow = scheduleService.getMergeRollPageData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", resultRow);
}
@ -1177,7 +1178,7 @@ public class ScheduleController {
scheduleService.processFinishTool(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1192,7 +1193,7 @@ public class ScheduleController {
scheduleService.processFinishMaterialWithNoRemainder(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
@ -1209,7 +1210,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1226,7 +1227,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1241,7 +1242,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.checkMergeSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1260,7 +1261,7 @@ public class ScheduleController {
.put("code", 200)
.put("success", true)
.put("rollNo", rollNo)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1275,7 +1276,7 @@ public class ScheduleController {
List< Map<String, Object>> resultList = scheduleService.getScheduleShiftWithSelect(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -1295,7 +1296,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.otherCheckSwitchSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1311,7 +1312,7 @@ public class ScheduleController {
scheduleService.otherSwitchSfdcRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1602,7 +1603,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("success", true)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
@ -1618,7 +1619,7 @@ public class ScheduleController {
scheduleService.repackFinishScheduleWithNoFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1633,7 +1634,7 @@ public class ScheduleController {
String shopOrderType = scheduleService.getShopOrderType(inData);
return R.ok()
.put("data", shopOrderType)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1662,7 +1663,7 @@ public class ScheduleController {
scheduleService.switchrollRepackAction(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
@ -1679,7 +1680,7 @@ public class ScheduleController {
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1694,7 +1695,7 @@ public class ScheduleController {
scheduleService.checkSplitScheduleSwitchRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1709,7 +1710,7 @@ public class ScheduleController {
scheduleService.splitScheduleSwitchRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1724,7 +1725,7 @@ public class ScheduleController {
List<Map<String, Object>> resultList = scheduleService.getSplitOrderParts(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -1741,7 +1742,7 @@ public class ScheduleController {
Map<String, Object> result = scheduleService.getSplitOrderCurrentRollReportedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", result);
}
@ -1755,7 +1756,7 @@ public class ScheduleController {
@PostMapping("saveYieldReport")
public R saveYieldReport(@RequestBody SfdcNewsfdcDto sfdcNewsfdcDto){
scheduleService.saveYieldReport(sfdcNewsfdcDto);
return R.ok(ResponseEnum.SUCCESS);
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1769,7 +1770,7 @@ public class ScheduleController {
Map<String, Object> resultMap = scheduleService.getSystemTimeData();
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -1784,7 +1785,7 @@ public class ScheduleController {
@PostMapping("rollSplit")
public R rollSplit(@RequestBody ShopOrderRollDto shopOrderRollDto){
scheduleService.rollSplit(shopOrderRollDto);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1797,7 +1798,7 @@ public class ScheduleController {
@PostMapping("scannerMaterial")
public R scannerMaterial(@RequestBody ShopOrderRollDto shopOrderRollDto){
scheduleService.scannerMaterial(shopOrderRollDto);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1848,7 +1849,7 @@ public class ScheduleController {
@PostMapping("deleteSfdcDefect")
public R deleteSfdcDefect(@RequestBody SfdcDefectData sfdcDefectData){
scheduleService.deleteSfdcDefect(sfdcDefectData);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
@ -1862,7 +1863,7 @@ public class ScheduleController {
@PostMapping("deleteSfdcTimeHist")
public R deleteSfdcTimeHist(@RequestBody SearchScheduleData inData){
scheduleService.deleteSfdcTimeHist(inData);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -1875,6 +1876,6 @@ public class ScheduleController {
@PostMapping("deleteSfdcMaterialHist")
public R deleteSfdcMaterialHist(@RequestBody SFDCMaterialHistOutData inData){
scheduleService.deleteSfdcMaterialHist(inData);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
}

80
src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java
View File

@ -1,9 +1,11 @@
package com.gaotao.modules.schedule.controller;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.utils.R;
import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData;
import com.gaotao.modules.schedule.data.*;
import com.gaotao.modules.schedule.service.SchedulingService;
import com.gaotao.modules.sys.controller.AbstractController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -22,7 +24,7 @@ import java.util.Map;
**/
@RestController
@RequestMapping(value = "/scheduling")
public class SchedulingController {
public class SchedulingController extends AbstractController {
@Autowired
private SchedulingService schedulingService;
@ -39,7 +41,7 @@ public class SchedulingController {
String workCenterNo = schedulingService.getCurrentWorkCenterNoByResourceId(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("workCenterNo", workCenterNo);
}
@ -55,7 +57,7 @@ public class SchedulingController {
schedulingService.scheduleWorkOrder(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -70,7 +72,7 @@ public class SchedulingController {
schedulingService.cancelSoSchedule(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -85,7 +87,7 @@ public class SchedulingController {
schedulingService.addWaitSchedule(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -100,7 +102,7 @@ public class SchedulingController {
schedulingService.reScheduleWorkOrders(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -115,7 +117,7 @@ public class SchedulingController {
schedulingService.moveUpSchedule(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -130,7 +132,7 @@ public class SchedulingController {
schedulingService.moveDownSchedule(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -145,7 +147,7 @@ public class SchedulingController {
List<ShopOrderOutData> resultList = schedulingService.getShopOrderListWithFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -162,7 +164,7 @@ public class SchedulingController {
List<OperatorOutData> resultList = schedulingService.getOperatorListWithFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -179,7 +181,7 @@ public class SchedulingController {
List<ScheduleData> resultList = schedulingService.getOrderScheduleListWithFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -196,7 +198,7 @@ public class SchedulingController {
schedulingService.scheduleFqcOperators(inMap);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -211,7 +213,7 @@ public class SchedulingController {
List<Map<String, Object>> resultList = schedulingService.getOrderPartStockedQty(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -228,7 +230,7 @@ public class SchedulingController {
schedulingService.updateScheduleWaitTimes(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -243,7 +245,7 @@ public class SchedulingController {
schedulingService.refreshScheduleByRouting(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -258,7 +260,7 @@ public class SchedulingController {
schedulingService.refreshScheduleByCalendar(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -273,7 +275,7 @@ public class SchedulingController {
Map<String, Object> resultMap = schedulingService.getCalendarMapByResourceId(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", resultMap);
}
@ -289,7 +291,7 @@ public class SchedulingController {
ShopOrderOutData resultRow = schedulingService.getShopOrderByCon(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", resultRow);
}
@ -305,7 +307,7 @@ public class SchedulingController {
ShopOrderOutData resultRow = schedulingService.getShopOrderByConWithFqc(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", resultRow);
}
@ -321,7 +323,7 @@ public class SchedulingController {
List<ShopOrderOutData> resultList = schedulingService.getShopOrderList(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -338,7 +340,7 @@ public class SchedulingController {
List<ResourceOutData> resultList = schedulingService.getOrderAvailableResource(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -356,7 +358,7 @@ public class SchedulingController {
schedulingService.scheduleOrderWithExpand(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -371,7 +373,7 @@ public class SchedulingController {
Map<String, Object> resultMap = schedulingService.refreshWorkPlatformButtonsWithSplit(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("resultMap", resultMap);
}
@ -387,7 +389,7 @@ public class SchedulingController {
Map<String, Object> pageMap = schedulingService.getSplitScheduleCreateRollPageData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("pageMap", pageMap);
}
@ -403,7 +405,7 @@ public class SchedulingController {
schedulingService.checkCreateSplitScheduleSeparateRoll(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -419,7 +421,7 @@ public class SchedulingController {
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -434,7 +436,7 @@ public class SchedulingController {
List<Map<String, Object>> resultList = schedulingService.getSplitScheduleSeparateRolls(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -451,7 +453,7 @@ public class SchedulingController {
List<ViewSapPoData> resultList = schedulingService.searchSapTransformOrder(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -468,7 +470,7 @@ public class SchedulingController {
Map<String, Object> resultMap = schedulingService.getTransformOrderBomData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("row", resultMap);
}
@ -484,7 +486,7 @@ public class SchedulingController {
List<CRollInfoOutData> resultList = schedulingService.getTransformRollTable(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -501,7 +503,7 @@ public class SchedulingController {
schedulingService.scanTransformPartRollNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -517,7 +519,7 @@ public class SchedulingController {
return R.ok()
.put("code", 200)
.put("printList", printList)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -532,7 +534,7 @@ public class SchedulingController {
List<CRollInfoOutData> resultList = schedulingService.getTransformedRollTable(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}
@ -549,7 +551,7 @@ public class SchedulingController {
List<Map<String, Object>> printList = schedulingService.getSfdcFlowLabelData(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("printList", printList);
}
@ -565,7 +567,7 @@ public class SchedulingController {
Map<String, Object> authMap = schedulingService.getScheduleMultiReportSpecialAuth(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("authMap", authMap);
}
@ -581,7 +583,7 @@ public class SchedulingController {
schedulingService.cancelScheduleWithScheduleQuery(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
@ -595,7 +597,7 @@ public class SchedulingController {
int nextItemNo = schedulingService.getScheduleNextItemNo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("nextItemNo", nextItemNo);
}
@ -612,7 +614,7 @@ public class SchedulingController {
schedulingService.batchScheduleOrderWithExpand(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
@ -626,7 +628,7 @@ public class SchedulingController {
@PostMapping("moveScheduleBun")
public R moveScheduleBun(@RequestBody SearchScheduleData inData){
schedulingService.moveScheduleBun(inData);
return R.ok();
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
}

95
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.gaotao.modules.schedule.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.exception.XJException;
import com.gaotao.common.utils.DateUtil;
import com.gaotao.common.utils.DateUtils;
@ -17,6 +18,7 @@ import com.gaotao.modules.schedule.mapper.ScheduleMapper;
import com.gaotao.modules.schedule.mapper.SchedulingMapper;
import com.gaotao.modules.schedule.service.ScheduleService;
import com.gaotao.modules.shopOrder.entity.OperatorData;
import com.gaotao.modules.sys.service.SysMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -42,6 +44,9 @@ public class ScheduleServiceImpl implements ScheduleService {
@Autowired
private SchedulingMapper schedulingMapper;
@Autowired
private SysMsgService sysMsgService;
@Override
public List<ShiftInfoData> getResourceRestList(SearchScheduleData inData) {
//获取当前加工中心机台对应的calendarId
@ -124,18 +129,18 @@ public class ScheduleServiceImpl implements ScheduleService {
public OperatorOutData getOperatorData(OperatorOutData inData) {
String operatorId = inData.getOperatorId();
if (null == operatorId || "".equals(operatorId)) {
throw new XJException("操作员编码不能为空!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200154));
}
//查到需要做判断
OperatorOutData operatorData = scheduleMapper.getOperatorData(inData);
//判断是否存在
if (null == operatorData) {
throw new XJException("用户不存在!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200155));
}
//判断是否停用
String status = operatorData.getStatus();
if ("N".equalsIgnoreCase(status)) {
throw new XJException("用户已停用!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200156));
}
return scheduleMapper.getOperatorData(inData);
}
@ -151,7 +156,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断是否查询到结果
if (null == result) {
result = new SfdcRollOpsData();
result.setRollNo("暂无卷号");
result.setRollNo(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200157));
}
return result;
}
@ -679,7 +684,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//是否可用
if ("N".equalsIgnoreCase(functionFlag)) {
resultMap.put("code", 400);
resultMap.put("msg", "当前功能不可用,请刷新页面后再试!");
resultMap.put("msg", sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200158));
return resultMap;
}
@ -690,7 +695,7 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer countNums = scheduleMapper.checkScheduleStatus(inData);
if (null == countNums || countNums == 0) {
resultMap.put("code", 400);
resultMap.put("msg", "该派工单上不存在或者已经被关闭，不能创建新卷!");
resultMap.put("msg", sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200159));
return resultMap;
}
//判断是否存在上机卷
@ -702,7 +707,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断是否存在上机卷
if (null != sfdcRollOps) {
resultMap.put("code", 400);
resultMap.put("msg", "该工序，有卷号(" + sfdcRollOps.getRollNo() + ")尚未完成，不能再次创建新卷号！");
resultMap.put("msg",sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200160) + sfdcRollOps.getRollNo());
return resultMap;
}
} else if ("switchRollFlag".equalsIgnoreCase(functionName)) {
@ -716,7 +721,7 @@ public class ScheduleServiceImpl implements ScheduleService {
String pauseFlag = sfdcRollOp.getPauseFlag();
if ("Y".equalsIgnoreCase(finishedFlag) || "Y".equalsIgnoreCase(pauseFlag)) {
resultMap.put("code", 400);
resultMap.put("msg", " 该卷号(" + sfdcRollOp.getRollNo() + ")在该工序已经生产结束或者暂停生产！");
resultMap.put("msg",sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200161) + sfdcRollOp.getRollNo() );
return resultMap;
}
//判断是否存在上机卷
@ -727,7 +732,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断是否存在当前的卷号
if (sfdcRolls.size() == 0) {
resultMap.put("code", 400);
resultMap.put("msg", " 该卷号(" + inData.getRollNo() + ")不存在！");
resultMap.put("msg", sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200162) + inData.getRollNo() );
return resultMap;
}
//如果存在
@ -735,7 +740,7 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer currentOpsItemNo = sfdcRoll.getCurrentOpsItemNo();
if (currentOpsItemNo == itemNo) {
resultMap.put("code", 400);
resultMap.put("msg", " 该卷号(" + inData.getRollNo() + ")是当前工序创建的，因此不存在'新卷下机'！");
resultMap.put("msg", sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200163) + inData.getRollNo() );
return resultMap;
}
//是否超过10% 需要再等等
@ -757,7 +762,7 @@ public class ScheduleServiceImpl implements ScheduleService {
}
//如果上面的验证通过
resultMap.put("code", 200);
resultMap.put("msg", "验证通过!");
resultMap.put("msg",sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return resultMap;
}
@ -1204,7 +1209,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断是否检验成功
String checkFlag = String.valueOf(checkMap.get("resultCode"));
if (!"Y".equalsIgnoreCase(checkFlag)) {
throw new XJException("当前卷号不在调试过程中，不允许上/更换工具!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200164));
}
//调用存储过程判断是否可以上工具
@ -1305,14 +1310,14 @@ public class ScheduleServiceImpl implements ScheduleService {
CRollInfoOutData cRollInfo = scheduleMapper.getCRollInfoByRollNo(inData);
//判断是否存在
if (null == cRollInfo) {
throw new XJException("查无此卷!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200165));
}
inData.setRmPartNo(cRollInfo.getPartNo());
//查询bom行数据
List<Map<String, Object>> resultList = scheduleMapper.getBomItemNosByPartNo(inData);
//判断是否存在
if (resultList.size() == 0) {
throw new XJException("工单：" + inData.getOrderNo() + "没有物料：" + cRollInfo.getPartNo() + "的BOM信息!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200166) + inData.getOrderNo() + "/" + cRollInfo.getPartNo() );
}
return resultList;
}
@ -1330,17 +1335,17 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer histSeqNo = inData.getHistSeqNo();
String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
if (histSeqNo >= 0) {
throw new XJException("请选择接换料功能!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200167));
}
if (bomItemNo < 0) {
throw new XJException("Bom序号没有获取到,请刷新页面后再试!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200168));
}
//检查是否是上材料的时机
String resultCode = this.checkProcessMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime);
if ("N".equalsIgnoreCase(resultCode)) {
throw new XJException("当前卷号不在调试过程中/不处于停机状态（停机原因是更换材料）,不允许上/更换材料!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200169));
}
//执行检查材料卷上机的功能
@ -1604,13 +1609,13 @@ public class ScheduleServiceImpl implements ScheduleService {
Float netIssueQty = sfdcMaterialData.getNetIssueQty();
//判断是否符合规则
if (netIssueQty == null) {
throw new XJException("材料上本卷耗用数量不能为空!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200170));
}
if (netIssueQty <= 0) {
throw new XJException("材料上本卷耗用数量必须大于0！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200171));
}
if (netIssueQty > transQty) {
throw new XJException("材料上本卷耗用数量大于发料数量!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200172));
}
}
@ -1862,7 +1867,7 @@ public class ScheduleServiceImpl implements ScheduleService {
String reportTime = inData.getReportTime();
String currentTime = reportDate + " " + reportTime;
if (histSeqNo <= -1) {
throw new XJException("请选择上料功能!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200173));
}
//检查是否是上材料的时机
@ -1988,7 +1993,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断报工的数量是否为正整数
Double remainderQty = approvedQty % 1.0;
if (remainderQty > 0) {
throw new XJException("总良品数量不允许输入小数！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200174));
}
//首先检查材料是否可以开始生产
@ -2050,19 +2055,19 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer histSeqNo = sfdcMaterialData.getHistSeqNo();
//判断是否符合规则
if (netIssueQty == null) {
throw new XJException("材料上本卷耗用数量不能为空!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200175));
}
if (netIssueQty < 0) {
throw new XJException("材料上本卷耗用数量必须大于等于0！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200176));
}
if (netIssueQty > transQty) {
throw new XJException("材料上本卷耗用数量大于发料数量!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200177));
}
int orderFirstItemNo = getOrderFirstItemNo(site, orderNo);
//判断是否是正常的报工
if ("N".equalsIgnoreCase(createNewRollFlag) && itemNo != orderFirstItemNo) {
if (netIssueQty.floatValue() != transQty.floatValue()) {
throw new XJException("正常结束卷时,主材必须完全耗用!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200178));
}
}
//调用存储过程校验每一个卷的数量
@ -2079,7 +2084,7 @@ public class ScheduleServiceImpl implements ScheduleService {
if (sfdcMaterialList.size() == 0) {
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("resultCode", 200);
resultMap.put("resultMsg", "校验成功!");
resultMap.put("resultMsg", sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return resultMap;
}
return null;
@ -3521,7 +3526,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断报工的数量是否为正整数
Double remainderQty = approvedQty % 1.0;
if (remainderQty > 0) {
throw new XJException("总良品数量不允许输入小数！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200179));
}
//首先检查材料是否可以开始生产
@ -3930,7 +3935,7 @@ public class ScheduleServiceImpl implements ScheduleService {
// 调用存储过程
Map<String, Object> checkMap = workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_fqc_check", params);
if (checkMap == null) {
throw new XJException("存储过程未返回信息", 400);
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200180), 400);
}
//判断结果是否成功
@ -4123,7 +4128,7 @@ public class ScheduleServiceImpl implements ScheduleService {
params.add(" ");
Map<String, Object> map = workbenchCreateslittingrollFqcCheck("workbench_postinspection", params);
if (map == null) {
throw new XJException("存储过程未返回信息", 400);
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200180), 400);
}
if ("400".equals(map.get("resultCode"))) {
throw new XJException(map.get("resultMsg").toString(), 400);
@ -4161,9 +4166,9 @@ public class ScheduleServiceImpl implements ScheduleService {
if (i > 0) {
String flag = scheduleMapper.getUserSpecialSecurity(inData.getUsername(), "236");
if ("Y".equals(flag)) {
throw new XJException("该机台尚有未结束的其他派工单，确实要继续对该派工单进行报工吗？", 400);
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200181), 400);
} else {
throw new XJException(" 该机台尚有未结束的其他派工单，不能对其他的派工单进行报工！", 300);
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200182), 300);
}
}
}
@ -4345,12 +4350,12 @@ public class ScheduleServiceImpl implements ScheduleService {
//判断报工的数量是否为正整数
Double remainderQty = approvedQty % 1.0;
if (remainderQty > 0) {
throw new XJException("总良品数量不允许输入小数！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200174));
}
//判断是否有主材上机
if (sfdcMaterialList.size() == 0) {
throw new XJException("未扫描主材不可结束卷!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200183));
}
//1.调用存储过程 校验工单 派工单 上机卷 信息是否符合条件
Map<String, Object> checkMap1 = this.checkFinishRollWithScheduleOpsShift(site, orderNo, itemNo, seqNo, rollNo, scheduledDate, shiftNo);
@ -4369,13 +4374,13 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer histSeqNo = sfdcMaterialData.getHistSeqNo();
//判断是否符合规则
if (netIssueQty == null) {
throw new XJException("材料上本卷耗用数量不能为空!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200175));
}
if (netIssueQty <= 0) {
throw new XJException("材料上本卷耗用数量必须大于0！");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200176));
}
if (netIssueQty > transQty) {
throw new XJException("材料上本卷耗用数量大于发料数量!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200177));
}
//调用存储过程校验每一个卷的数量
Map<String, Object> resultMap = this.checkRepackFinishRollWithSfdcMaterialHist(site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo, username);
@ -4578,7 +4583,7 @@ public class ScheduleServiceImpl implements ScheduleService {
public void switchrollRepackAction(SearchScheduleData scheduleData) {
Map<String, Object> checkMap = switchrollRepackCheck(scheduleData);
if (checkMap == null) {
throw new XJException("存储过程未返回信息", 400);
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200180), 400);
}
//判断结果是否成功
String checkCode = String.valueOf(checkMap.get("resultCode"));
@ -4870,7 +4875,7 @@ public class ScheduleServiceImpl implements ScheduleService {
// 校验
String RMType_DB = scheduleMapper.checkKeyMart(shopOrderRollDto);
if (!StringUtils.isEmpty(RMType_DB) && "key Mart".equals(RMType_DB)) {
throw new XJException(String.valueOf("该材料是主材，不能应用于该功能，请重新输入!"));
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200184));
}
// 执行
String currentTime = DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
@ -4972,17 +4977,17 @@ public class ScheduleServiceImpl implements ScheduleService {
CRollInfoOutData cRollInfo = scheduleMapper.getCRollInfoByRollNo(inData);
//判断是否存在
if (null == cRollInfo) {
throw new XJException("查无此卷!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200165));
}
if ("D".equals(cRollInfo.getStatusDb())) {
throw new XJException("该卷已好用!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200185));
}
inData.setRmPartNo(cRollInfo.getPartNo());
//查询bom行数据
List<Map<String, Object>> resultList = scheduleMapper.getBomItemNosByKeyPartNo(inData);
//判断是否存在
if (resultList.size() == 0) {
throw new XJException("请扫描主材,工单:" + inData.getOrderNo());
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200186) + inData.getOrderNo());
}
return resultList;
}
@ -5000,17 +5005,17 @@ public class ScheduleServiceImpl implements ScheduleService {
Integer histSeqNo = inData.getHistSeqNo();
String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
if (histSeqNo >= 0) {
throw new XJException("请选择接换料功能!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200167));
}
if (bomItemNo < 0) {
throw new XJException("Bom序号没有获取到,请刷新页面后再试!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200168));
}
//检查是否是上材料的时机
String resultCode = this.checkProcessKeyMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime);
if ("N".equalsIgnoreCase(resultCode)) {
throw new XJException("当前卷号不在调试过程中/不处于停机状态（停机原因是更换材料）,不允许上/更换材料!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200169));
}
//执行检查材料卷上机的功能

21
src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.gaotao.modules.schedule.service.impl;
import com.alibaba.fastjson.JSON;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.exception.XJException;
import com.gaotao.common.utils.DateUtil;
import com.gaotao.modules.pda.dao.TransNoDao;
@ -12,6 +13,7 @@ import com.gaotao.modules.schedule.mapper.ScheduleMapper;
import com.gaotao.modules.schedule.mapper.SchedulingMapper;
import com.gaotao.modules.schedule.service.ScheduleService;
import com.gaotao.modules.schedule.service.SchedulingService;
import com.gaotao.modules.sys.service.SysMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -40,12 +42,15 @@ public class SchedulingServiceImpl implements SchedulingService {
@Autowired
private ScheduleService scheduleService;
@Autowired
private SysMsgService sysMsgService;
@Override
public String getCurrentWorkCenterNoByResourceId(SearchScheduleData inData) {
String workCenterNo = schedulingMapper.getCurrentWorkCenterNoByResourceId(inData);
//判断是否存在
if (null == workCenterNo || "".equalsIgnoreCase(workCenterNo)) {
throw new XJException("机台编码有误!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200187));
}
return workCenterNo;
}
@ -68,7 +73,7 @@ public class SchedulingServiceImpl implements SchedulingService {
Map<String, Object> calendarMap = scheduleMapper.getCalendarId(inData);
//判断是否存在当前的加工中心机台数据
if (calendarMap == null || calendarMap.size() == 0) {
throw new XJException("班次异常!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200188));
}
//设置查询的条件
String calendarId = String.valueOf(calendarMap.get("calendarId"));
@ -212,7 +217,7 @@ public class SchedulingServiceImpl implements SchedulingService {
Map<String, Object> calendarMap = scheduleMapper.getCalendarId(inData);
//判断是否存在当前的加工中心机台数据
if (calendarMap == null || calendarMap.size() == 0) {
throw new XJException("班次异常!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200188));
}
//设置查询的条件
String calendarId = String.valueOf(calendarMap.get("calendarId"));
@ -409,7 +414,7 @@ public class SchedulingServiceImpl implements SchedulingService {
List<OperatorInData> operatorList = JSON.parseArray(strOperatorlList, OperatorInData.class);
String strCheckFlag = String.valueOf(inMap.get("checkFlag"));
if (operatorList.size() == 0) {
throw new XJException("暂无需要排产的数据!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200189));
}
//公共参数
String site = pageData.getSite();
@ -449,7 +454,7 @@ public class SchedulingServiceImpl implements SchedulingService {
Map<String, Object> calendarMap = scheduleMapper.getCalendarId(pageData);
//判断是否存在当前的加工中心机台数据
if (calendarMap == null || calendarMap.size() == 0) {
throw new XJException("班次异常!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200188));
}
//设置查询的条件
String calendarId = String.valueOf(calendarMap.get("calendarId"));
@ -970,17 +975,17 @@ public class SchedulingServiceImpl implements SchedulingService {
CRollInfoOutData rollData = schedulingMapper.getTransformPartRoll(inData);
//判断是否存在
if (null == rollData) {
throw new XJException("卷号不存在!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200190));
}
//继续判断物料编码和当前的原物料编码
String rmPartNo = rollData.getPartNo();
if (!rmPartNo.equalsIgnoreCase(oriPartNo)) {
throw new XJException("卷物料编码和BOM的物料编码不一致!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200191));
}
//验证卷是否已耗用
String statusDb = rollData.getStatusDb();
if (!"I".equalsIgnoreCase(statusDb)) {
throw new XJException("该卷号不在材料库无法转换!");
throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200192));
}
//其他验证 待添加
//设置参数

Write Preview
Loading…
Cancel
Save