From 70ba74321b0f4ae2751c6afadf4484a4e19f99da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 八月 2023 18:09:24 +0800
Subject: [PATCH] 工单投料和产出状态流程为【生产中】
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 10 +++++++++-
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 4 ++--
server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java | 7 +++++--
server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java | 2 +-
server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java | 2 +-
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 7 +++++++
server/src/main/java/doumeemes/core/utils/Constants.java | 16 +++++++++++++++-
7 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/doumeemes/core/utils/Constants.java b/server/src/main/java/doumeemes/core/utils/Constants.java
index a373176..deadd68 100644
--- a/server/src/main/java/doumeemes/core/utils/Constants.java
+++ b/server/src/main/java/doumeemes/core/utils/Constants.java
@@ -265,6 +265,7 @@
public static final int baogong= 4;
public static final int instock = 5;
public static final int cancel = 6;
+ public static final int producing = 7;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -288,6 +289,9 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
+ break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -317,6 +321,9 @@
break;
case cancel:
title="宸ュ崟鍙栨秷";
+ break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
break;
default:
break;
@@ -378,7 +385,7 @@
}
}
/**
- * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭"
+ * 宸ュ崟鐘舵�� 0宸插垱寤恒��1宸叉姇鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸叉殏鍋溿��7宸插彇娑堛��8宸插叧闂� 9宸叉仮澶� 10鏇存崲浜哄憳 11 宸插鏂� 12 浜у嚭 13鐢熸垚涓�"
*/
public interface WORKORDER_HISTORY_STATUS{
public static final int create = 0;
@@ -394,6 +401,7 @@
public static final int redistribute = 10;
public static final int readyMaterial = 11;
public static final int produce = 12;
+ public static final int producing = 13;
static String getTitleByStatus(WorkorderExtListVO p, int status) {
String title = "";
switch (status){
@@ -435,6 +443,9 @@
break;
case produce:
title="宸ュ崟浜у嚭";
+ break;
+ case producing:
+ title="宸ュ崟鐢熸垚涓浗";
break;
default:
break;
@@ -483,6 +494,9 @@
case produce:
title="宸ュ崟浜у嚭";
break;
+ case producing:
+ title="宸ュ崟鐢熶骇涓�";
+ break;
default:
break;
}
diff --git a/server/src/main/java/doumeemes/dao/business/model/Workorder.java b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
index be3da0c..7967078 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -143,8 +143,8 @@
@ExcelColumn(name="妫�楠屼汉鍛樼紪鐮�")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
- @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
+ @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�")
private Integer status;
@ApiModelProperty(value = "鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�", example = "1")
@ExcelColumn(name="鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�")
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
index afca5cb..a38ad97 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderHistory.java
@@ -76,7 +76,7 @@
@ExcelColumn(name="澶勭悊澶囨敞")
private String info;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴", example = "1")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴 13鐢熶骇涓�", example = "1")
@ExcelColumn(name="鎿嶄綔绫诲瀷0宸插垱寤恒��1宸叉姇鏂欍��2瀹屽伐銆�3妫�楠屻��4宸叉姤宸ャ��5鍏ュ簱銆�6鏆傚仠銆�7鍙栨秷銆�8鍏抽棴")
private Integer type;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
index b826172..02fe90c 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
@@ -74,7 +74,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞崟鍙�" )
- @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
+ @ExcelColumn(name="閿�鍞崟鍙�",index = 16,width =15)
private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@ExcelColumn(name="鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級")
diff --git a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
index 51b8316..68035c0 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckServiceImpl.java
@@ -276,8 +276,11 @@
//宸ュ崟瀵硅薄
Workorder workorder=workorderExtMapper.selectById(wc.getWorkorderId());
- if(workorder==null || workorder.getStatus()==Constants.WORKORDER_STATUS.done||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
- ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
+ if(workorder==null
+ || workorder.getStatus()==Constants.WORKORDER_STATUS.done
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.baogong
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.instock
+ ||workorder.getStatus()==Constants.WORKORDER_STATUS.cancel){
return ApiResponse.failed("宸ュ崟涓嶅厑璁告楠�");
}
if(workorder.getPlanNum()!=null){
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index ba89d09..0cdce35 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1338,6 +1338,13 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
+ }else if(status ==Constants.WORKORDER_HISTORY_STATUS.produce){
+ //鎶曟枡鎿嶄綔
+ if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
+ ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
+ //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
+ order.setStatus(Constants.WORKORDER_STATUS.producing);
+ }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index 8ae95e2..a6082f3 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -142,9 +142,10 @@
recordList.add(getWorkrecordModel(user,wStock,mp,materialListDTO.getNum()));
}
}
+
//鎵归噺鎻掑叆鎶曟枡璁板綍
workorderRecordExtMapper.insertBatch(recordList);
- //鍗曟坊鍔犲巻鍙茶褰曪紙涓嶆洿鏂扮姸鎬侊級
+ //鍗曟坊鍔犲巻鍙茶褰曪紙鍒ゆ柇鏇存柊涓虹敓浜т腑锛�
updateOrderInfo(user,mp,Constants.WORKORDER_HISTORY_STATUS.material);
return param.getId();
}
@@ -294,6 +295,13 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
+ }else if(status ==Constants.WORKORDER_HISTORY_STATUS.material){
+ //鎶曟枡鎿嶄綔
+ if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
+ ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
+ //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
+ order.setStatus(Constants.WORKORDER_STATUS.producing);
+ }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
--
Gitblit v1.9.3