From 76d42e71fc0adbf3b6b88725e3c3ee0166012da9 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 21 Jul 2023 17:24:01 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=BB=B4=E6=8A=A4=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
=?UTF-8?q?=E3=80=81=E4=BA=A7=E5=93=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sap/service/impl/WmsToSapServiceImpl.java | 2 +-
.../saleorder/service/dao/MpsSaleOrder.java | 15 ++++++---------
.../dao/mapper/xml/MpsSaleOrderMapper.xml | 6 ++++++
.../service/impl/MpsSaleOrderServiceImpl.java | 6 +++---
.../dao/PdmBiProductprocessroute.java | 4 ++--
.../PdmBiProductprocessrouteServiceImpl.java | 4 ++--
.../wms/product_manage/备份pdm/wql/pdm.xls | Bin 222208 -> 222208 bytes
.../src/views/wms/pdm/base/bom/AddDialog.vue | 4 ++--
.../wms/pdm/base/productRoute/AddDialog.vue | 8 ++++----
9 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java
index 2c691cbc..7200ed3d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java
@@ -175,7 +175,7 @@ public class WmsToSapServiceImpl implements WmsToSapService {
}
//sale_jo.setPlandeliver_date(row.getString("Edatu"));
sale_jo.setCreate_id(SecurityUtils.getCurrentUserId());
- sale_jo.setCreate_time(new Date());
+ sale_jo.setCreate_time(DateUtil.now());
sale_jo.setCreate_name(SecurityUtils.getCurrentNickName());
if (need_update) {
saleOrderService.updateById(sale_jo);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
index f493f88f..d36be4b5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
@@ -1,16 +1,13 @@
package org.nl.wms.mps_manage.saleorder.service.dao;
-import java.math.BigDecimal;
-
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
/**
*
* 生产订单表
@@ -94,7 +91,7 @@ public class MpsSaleOrder implements Serializable{
* 计划交期
*/
@ApiModelProperty(value = "/**计划交期*/")
- private Date plandeliver_date;
+ private String plandeliver_date;
/**
* 创建人
*/
@@ -110,7 +107,7 @@ public class MpsSaleOrder implements Serializable{
*/
@ApiModelProperty(value = "/**创建时间*/")
@TableField(fill = FieldFill.INSERT)
- private Date create_time;
+ private String create_time;
/**
* 提交人
*/
@@ -216,5 +213,5 @@ public class MpsSaleOrder implements Serializable{
* aps变更时间
*/
@ApiModelProperty(value = "/**aps变更时间*/")
- private Date aps_update_time;
+ private String aps_update_time;
}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
index 690ee974..7c2edeb5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
@@ -26,6 +26,12 @@
and der.cust_code >= #{query.cust_code}
+
+ and der.create_time >= #{query.start_time}
+
+
+ and #{query.end_time} >= der.create_time
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
index 056b9f5c..ede19516 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
@@ -112,7 +112,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl().eq("cust_code", mpsSaleOrder.getCust_code()));
mpsSaleOrder.setCust_id(cust.getCust_id());
mpsSaleOrder.setCust_name(cust.getCust_name());
@@ -147,7 +147,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl().set("productprocess_status", "20").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_id", SecurityUtils.getCurrentUserId()).set("audit_name", SecurityUtils.getCurrentNickName()).set("audit_time", DateUtil.now()).eq("processroute_id", whereJson.getString("processroute_id")));
+ this.update(new UpdateWrapper().set("productprocess_status", "20").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_optid", SecurityUtils.getCurrentUserId()).set("audit_optname", SecurityUtils.getCurrentNickName()).set("audit_time", DateUtil.now()).eq("productprocess_id", whereJson.getString("productprocess_id")));
}
@Override
public void unSubmit(JSONObject whereJson) {
- this.update(new UpdateWrapper().set("productprocess_status", "10").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_id", " ").set("audit_name", " ").set("audit_time", " ").eq("processroute_id", whereJson.getString("processroute_id")));
+ this.update(new UpdateWrapper().set("productprocess_status", "10").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_optid", " ").set("audit_optname", " ").set("audit_time", " ").eq("productprocess_id", whereJson.getString("productprocess_id")));
}
@Override
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls
index ab37737b5ebda35fc0fb7e59640b39d9d2001b10..5f3eac40628449ef06207c2b9b913a566784d3bd 100644
GIT binary patch
delta 54034
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
Wu;3kb^MqjT{)R!pL%iM|`u_kU{A+gr
diff --git a/mes/qd/src/views/wms/pdm/base/bom/AddDialog.vue b/mes/qd/src/views/wms/pdm/base/bom/AddDialog.vue
index 6b73d920..0e928ed1 100644
--- a/mes/qd/src/views/wms/pdm/base/bom/AddDialog.vue
+++ b/mes/qd/src/views/wms/pdm/base/bom/AddDialog.vue
@@ -216,10 +216,10 @@ export default {
this.form.material_spec = row.material_spec
this.form.bom_code = 'BOM' + row.material_spec
this.form.bom_name = row.material_name
- this.getProduceProcessRouteByMaterialId(this.form.material_uuid)
+ this.getProduceProcessRouteByMaterialId(this.form.material_id)
},
getProduceProcessRouteByMaterialId(material_uuid) {
- crudBom.getProduceProcessRouteByMaterialId({ material_uuid: material_uuid }).then(res => {
+ crudBom.getProduceProcessRouteByMaterialId({ material_id: material_uuid }).then(res => {
this.form.processroute_uuid = res.productprocess_id
this.getworkprocedureListByProduceProcessRouteId(this.form.processroute_uuid, material_uuid)
})
diff --git a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue
index a359b6ec..bbe0ac09 100644
--- a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue
+++ b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue
@@ -30,7 +30,7 @@
-
+