Skip to content

M
mes
Commit a19261ab authored by 温志超's avatar 温志超
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents f98baaba 19d0107a
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 18 deletions
admin/src/main/resources/i18n/messages.properties
View file @ a19261ab
......@@ -78,9 +78,9 @@ md.factory.error.not.exist=\u5DE5\u5382\u4E0D\u5B58\u5728
md.workShop.error.not.exist=\u8F66\u95F4\u4E0D\u5B58\u5728
#md.workStation
md.workStation.error.not.exist=\u5DE5\u4F5C\u4E2D\u5FC3\u4E0D\u5B58\u5728
md.workStation.error.not.productionSolutionCode = \u751f\u4ea7\u7248\u672c\u53f7\u4e0d\u5141\u8bb8\u4e3a\u7a7a
md.workStation.error.productionSolutionCode.unique = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7
md.workStation.error.productionSolutionCode.size = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7\u5df2\u6709\u6570\u503c\u8f83\u5927\u7684\u5b58\u5728
md.workStation.error.not.productionSolutionCode = \u751F\u4EA7\u7248\u672C\u53F7\u4E0D\u5141\u8BB8\u4E3A\u7A7A
md.workStation.error.productionSolutionCode.unique = \u8BE5\u4EA7\u54C1\u4E0B\u5DF2\u6709\u76F8\u5173\u751F\u4EA7\u7248\u672C\u53F7
md.workStation.error.productionSolutionCode.size = \u8BE5\u4EA7\u54C1\u4E0B\u5DF2\u6709\u76F8\u5173\u751F\u4EA7\u7248\u672C\u53F7\u5DF2\u6709\u6570\u503C\u8F83\u5927\u7684\u5B58\u5728
md.workStation.error.cannot.remove=\u8BE5\u5DE5\u4F5C\u4E2D\u5FC3\u5DF2\u7ECF\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5173\u95ED
#md.workUnit
md.workUnit.error.not.exist=\u5DE5\u4F5C\u5355\u5143\u4E0D\u5B58\u5728
......@@ -150,7 +150,7 @@ pro.tool.error.error29=\u5DE5\u5355\u7F16\u7801\uFF1A{0}\uFF0C\u5DE5\u88C5\u91CF
#md.process
md.process.error.not.exist=\u5DE5\u5E8F\u4E0D\u5B58\u5728
#pro.workOrder
pro.workOrder.status.published.error = \u53ea\u80fd\u4fee\u6539\u5904\u4e8e\u5df2\u53d1\u5e03\u72b6\u6001\u5de5\u5355
pro.workOrder.status.published.error = \u53EA\u80FD\u4FEE\u6539\u5904\u4E8E\u5DF2\u53D1\u5E03\u72B6\u6001\u5DE5\u5355
pro.workOrder.error.not.exist=\u5DE5\u5355\u4E0D\u5B58\u5728
pro.workOrder.error.limit.min.quantity=\u5DE5\u5355\u751F\u4EA7\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
pro.workOrder.error.workOrderNo.exist=\u751F\u4EA7\u5DE5\u5355\u7F16\u53F7\u5DF2\u5B58\u5728
......@@ -187,13 +187,13 @@ pro.schedule.limit.min.duration=\u751F\u4EA7\u65F6\u957F\u5FC5\u987B\u5927\u4E8E
pro.schedule.error.canNot.use.standardTime=\u4E0D\u652F\u6301\u5DE5\u65F6\u5355\u4F4D{0}
pro.schedule.error.cal.error1=\u65E5\u5386\u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u5927\u4E8E\u5F00\u59CB\u65F6\u95F4
pro.schedule.error.not.exist.solution=\u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u751F\u4EA7\u7248\u672C\u672A\u627E\u5230
pro.schedule.error.not.exist.process = \u751f\u4ea7\u5de5\u5355\uff1a{0}\u672a\u8bbe\u7f6e\u5de5\u827a\u8def\u7ebf
pro.schedule.error.not.exist.process = \u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u672A\u8BBE\u7F6E\u5DE5\u827A\u8DEF\u7EBF
pro.schedule.error.fail=\u6392\u4EA7\u5931\u8D25{0},{1},{2}
pro.schedule.error.not.exist.main.task=\u6CA1\u6709\u67E5\u5230\u4E3B\u8981\u6392\u4EA7\u4EFB\u52A1
pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u6392\u4EA7\u6570\u91CF
pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u53EF\u6392\u4EA7\u6570\u91CF
#pro.feedback
pro.feedback.error.not.data=\u672A\u627E\u5230\u62A5\u5DE5\u8BB0\u5F55.
pro.feedback.error.notTheLatest = \u4e0d\u662f\u6700\u65b0\u7684\u8bb0\u5f55\u65e0\u6cd5\u4fee\u6539
pro.feedback.error.notTheLatest = \u4E0D\u662F\u6700\u65B0\u7684\u8BB0\u5F55\u65E0\u6CD5\u4FEE\u6539
pro.feedback.error.repeat.serialNo.report=\u8BE5\u5E8F\u5217\u53F7\u4EFB\u52A1\u5DF2\u62A5\u5DE5
pro.feedback.error.serialNo.not.bind.workOrder=\u5E8F\u5217\u53F7\u4E0D\u5C5E\u6027\u8BE5\u5DE5\u5355\u4EFB\u52A1
pro.feedback.error.min.quantity=\u62A5\u5DE5\u6570\u91CF\u4E0D\u80FD\u5C0F\u4E8E\u7B49\u4E8E0
......@@ -215,4 +215,4 @@ qc.error.error6=\u68C0\u6D4B\u9879\u7F16\u53F7\u5DF2\u5B58\u5728
qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
#system.printer
system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
rule.currentSerial.error= \u8be5\u4ea7\u54c1\u5e8f\u5217\u53f7\u5269\u4f59\u003a{0}\u4e0d\u6ee1\u8db3\u5de5\u5355\u6570\u91cf\u003a{1}
\ No newline at end of file
rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
\ No newline at end of file
admin/src/main/resources/i18n/messages_zh_CN.properties
View file @ a19261ab
......@@ -78,9 +78,9 @@ md.factory.error.not.exist=\u5DE5\u5382\u4E0D\u5B58\u5728
md.workShop.error.not.exist=\u8F66\u95F4\u4E0D\u5B58\u5728
#md.workStation
md.workStation.error.not.exist=\u5DE5\u4F5C\u4E2D\u5FC3\u4E0D\u5B58\u5728
md.workStation.error.not.productionSolutionCode = \u751f\u4ea7\u7248\u672c\u53f7\u4e0d\u5141\u8bb8\u4e3a\u7a7a
md.workStation.error.productionSolutionCode.unique = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7
md.workStation.error.productionSolutionCode.size = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7\u5df2\u6709\u6570\u503c\u8f83\u5927\u7684\u5b58\u5728
md.workStation.error.not.productionSolutionCode = \u751F\u4EA7\u7248\u672C\u53F7\u4E0D\u5141\u8BB8\u4E3A\u7A7A
md.workStation.error.productionSolutionCode.unique = \u8BE5\u4EA7\u54C1\u4E0B\u5DF2\u6709\u76F8\u5173\u751F\u4EA7\u7248\u672C\u53F7
md.workStation.error.productionSolutionCode.size = \u8BE5\u4EA7\u54C1\u4E0B\u5DF2\u6709\u76F8\u5173\u751F\u4EA7\u7248\u672C\u53F7\u5DF2\u6709\u6570\u503C\u8F83\u5927\u7684\u5B58\u5728
md.workStation.error.cannot.remove=\u8BE5\u5DE5\u4F5C\u4E2D\u5FC3\u5DF2\u7ECF\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5173\u95ED
#md.workUnit
md.workUnit.error.not.exist=\u5DE5\u4F5C\u5355\u5143\u4E0D\u5B58\u5728
......@@ -150,7 +150,7 @@ pro.tool.error.error29=\u5DE5\u5355\u7F16\u7801\uFF1A{0}\uFF0C\u5DE5\u88C5\u91CF
#md.process
md.process.error.not.exist=\u5DE5\u5E8F\u4E0D\u5B58\u5728
#pro.workOrder
pro.workOrder.status.published.error = \u53ea\u80fd\u4fee\u6539\u5904\u4e8e\u5df2\u53d1\u5e03\u72b6\u6001\u5de5\u5355
pro.workOrder.status.published.error = \u53EA\u80FD\u4FEE\u6539\u5904\u4E8E\u5DF2\u53D1\u5E03\u72B6\u6001\u5DE5\u5355
pro.workOrder.error.not.exist=\u5DE5\u5355\u4E0D\u5B58\u5728
pro.workOrder.error.limit.min.quantity=\u5DE5\u5355\u751F\u4EA7\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0
pro.workOrder.error.workOrderNo.exist=\u751F\u4EA7\u5DE5\u5355\u7F16\u53F7\u5DF2\u5B58\u5728
......@@ -187,13 +187,13 @@ pro.schedule.limit.min.duration=\u751F\u4EA7\u65F6\u957F\u5FC5\u987B\u5927\u4E8E
pro.schedule.error.canNot.use.standardTime=\u4E0D\u652F\u6301\u5DE5\u65F6\u5355\u4F4D{0}
pro.schedule.error.cal.error1=\u65E5\u5386\u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u5927\u4E8E\u5F00\u59CB\u65F6\u95F4
pro.schedule.error.not.exist.solution=\u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u751F\u4EA7\u7248\u672C\u672A\u627E\u5230
pro.schedule.error.not.exist.process = \u751f\u4ea7\u5de5\u5355\uff1a{0}\u672a\u8bbe\u7f6e\u5de5\u827a\u8def\u7ebf
pro.schedule.error.not.exist.process = \u751F\u4EA7\u5DE5\u5355\uFF1A{0}\u672A\u8BBE\u7F6E\u5DE5\u827A\u8DEF\u7EBF
pro.schedule.error.fail=\u6392\u4EA7\u5931\u8D25{0},{1},{2}
pro.schedule.error.not.exist.main.task=\u6CA1\u6709\u67E5\u5230\u4E3B\u8981\u6392\u4EA7\u4EFB\u52A1
pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u6392\u4EA7\u6570\u91CF
pro.schedule.error.split.quantity.lack=\u62C6\u5206\u6570\u91CF\u5FC5\u9700\u5C0F\u4E8E\u53EF\u6392\u4EA7\u6570\u91CF
#pro.feedback
pro.feedback.error.not.data=\u672A\u627E\u5230\u62A5\u5DE5\u8BB0\u5F55
pro.feedback.error.notTheLatest = \u4e0d\u662f\u6700\u65b0\u7684\u8bb0\u5f55\u65e0\u6cd5\u4fee\u6539
pro.feedback.error.notTheLatest = \u4E0D\u662F\u6700\u65B0\u7684\u8BB0\u5F55\u65E0\u6CD5\u4FEE\u6539
pro.feedback.error.repeat.serialNo.report=\u8BE5\u5E8F\u5217\u53F7\u4EFB\u52A1\u5DF2\u62A5\u5DE5
pro.feedback.error.serialNo.not.bind.workOrder=\u5E8F\u5217\u53F7\u4E0D\u5C5E\u6027\u8BE5\u5DE5\u5355\u4EFB\u52A1
pro.feedback.error.min.quantity=\u62A5\u5DE5\u6570\u91CF\u4E0D\u80FD\u5C0F\u4E8E\u7B49\u4E8E0
......@@ -215,4 +215,4 @@ qc.error.error6=\u68C0\u6D4B\u9879\u7F16\u53F7\u5DF2\u5B58\u5728
qc.error.error7=\u68C0\u6D4B\u9879\u540D\u79F0\u5DF2\u5B58\u5728
#system.printer
system.printer.error.repeat.bind=\u8BE5\u6253\u5370\u673A\u5DF2\u7ED1\u5B9A\u4E86
rule.currentSerial.error= \u8be5\u4ea7\u54c1\u5e8f\u5217\u53f7\u5269\u4f59\u003a{0}\u4e0d\u6ee1\u8db3\u5de5\u5355\u6570\u91cf\u003a{1}
\ No newline at end of file
rule.currentSerial.error= \u8BE5\u4EA7\u54C1\u5E8F\u5217\u53F7\u5269\u4F59:{0}\u4E0D\u6EE1\u8DB3\u5DE5\u5355\u6570\u91CF:{1}
\ No newline at end of file
mes/src/main/java/com/ximai/mes/pro/controller/task/ProTaskController.java
View file @ a19261ab
......@@ -256,7 +256,6 @@ public class ProTaskController extends BaseController {
ExceptionUtil.checkTrueThrowException(StringUtils.isNull(proTaskVo.getScheduleStartDate()), MessageUtils.message("pro.schedule.error.not.null.startTime"));
ExceptionUtil.checkTrueThrowException(StringUtils.isNull(proTaskVo.getDuration()) || proTaskVo.getDuration() <= 0L, MessageUtils.message("pro.schedule.limit.min.duration"));
ExceptionUtil.checkTrueThrowException(StringUtils.isNull(proTaskVo.getWorkunitId()), MessageUtils.message("md.workUnit.error.not.null"));
ExceptionUtil.checkTrueThrowException(Objects.equals(proTaskVo.getTaskWorkunit().getWorkunitId(), proTaskVo.getWorkunitId()), MessageUtils.message("md.workUnit.error.forbid.bind"));
ExceptionUtil.checkTrueThrowException(proTaskVo.getQuantity().compareTo(BigDecimal.ZERO) != 1, MessageUtils.message("pro.schedule.limit.min.quantity"));
......
mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java
View file @ a19261ab
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ximai.common.exception.ServiceException;
import com.ximai.common.utils.MessageUtils;
import com.ximai.common.utils.data.DataUtil;
import com.ximai.common.utils.data.ExceptionUtil;
......@@ -103,8 +104,10 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
*/
@Override
public ProProductionSolutionVo selectProProductionSolutionByProductionSolutionId(Long productionSolutionId) {
ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(productionSolutionId);
if(proProductionSolution==null){
throw new ServiceException(MessageUtils.message("pro.workOrder.error.not.null.process.solution"));
}
// 根据id获取头表信息
QueryWrapper<ProProductionSolutionBomHead> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("production_solution_id", productionSolutionId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment