root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:维护销售订单、工艺路线、产品工艺路线功能

Browse Source
This commit is contained in:
zhouz
2023-07-21 17:24:01 +08:00
parent d43b0ba9eb
commit 76d42e71fc
9 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java
View File

@@ -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);

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
View File

@@ -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;
/**
* <p>
* 生产订单表
@@ -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;
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -26,6 +26,12 @@
<if test="query.cust_code != null">
and der.cust_code >= #{query.cust_code}
</if>
<if test="query.start_time != null and query.start_time != ''">
and der.create_time >= #{query.start_time}
</if>
<if test="query.end_time != null and query.end_time != ''">
and #{query.end_time} >= der.create_time
</if>
</where>

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
View File

@@ -112,7 +112,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
mpsSaleOrder.setStatus("10");
mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId());
mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentNickName());
mpsSaleOrder.setCreate_time(new Date());
mpsSaleOrder.setCreate_time(DateUtil.now());
MdCsCustomerbase cust = icustomerbaseService.getOne(new QueryWrapper<MdCsCustomerbase>().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<MpsSaleOrderMapper,MpsS
MpsSaleOrder mpsSaleOrder = new MpsSaleOrder();
mpsSaleOrder.setSale_type("01");
mpsSaleOrder.setStatus("10");
mpsSaleOrder.setCreate_time(new Date());
mpsSaleOrder.setCreate_time(DateUtil.now());
mpsSaleOrder.setConfirm_time(DateUtil.now());
mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId());
mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentUsername());
@@ -227,7 +227,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
if(StringUtils.isBlank(col)) {
throw new BadRequestException("订单交期不能为空");
}
mpsSaleOrder.setPlandeliver_date(DateUtil.parse(col));
mpsSaleOrder.setPlandeliver_date(String.valueOf(DateUtil.parse(col)));
}
if(j == 8) {
//备注

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java
View File

@@ -84,12 +84,12 @@ public class PdmBiProductprocessroute implements Serializable {
/**
* 审核人
*/
private String audit_id;
private String audit_optid;
/**
* 审核人姓名
*/
private String audit_name;
private String audit_optname;
/**
* 审核时间

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
View File

@@ -185,12 +185,12 @@ public class PdmBiProductprocessrouteServiceImpl extends ServiceImpl<PdmBiProduc
@Override
public void submit(JSONObject whereJson) {
this.update(new UpdateWrapper<PdmBiProductprocessroute>().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<PdmBiProductprocessroute>().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<PdmBiProductprocessroute>().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<PdmBiProductprocessroute>().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

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls
View File

Binary file not shown.

4
mes/qd/src/views/wms/pdm/base/bom/AddDialog.vue
View File

@@ -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)
})

8
mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue
View File

@@ -30,7 +30,7 @@
<treeselect
v-model="form.class_id"
:options="classes3"
:disabled="crud.status.view > 0"
:disabled="crud.status.view > 0 || crud.status.edit > 0"
:auto-load-root-options="false"
:load-options="loadChildNodes"
style="width: 200px;"
@@ -44,7 +44,7 @@
<el-select
v-model="form.product_area"
placeholder=""
:disabled="crud.status.view > 0"
:disabled="crud.status.view > 0 || crud.status.edit > 0"
style="width: 200px"
>
<el-option
@@ -67,7 +67,7 @@
size="mini"
class="filter-item"
style="width: 200px;"
:disabled="crud.status.view > 0"
:disabled="crud.status.view > 0 || crud.status.edit > 0"
@change="getDtl(form.processroute_id)"
>
<el-option
@@ -81,7 +81,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="备注" style="margin-left: 8px">
<el-input v-model="form.remark" style="width: 350px;" type="textarea" :disabled="crud.status.view > 0" />
<el-input v-model="form.remark" style="width: 350px;" type="textarea" :disabled="crud.status.view > 0 || crud.status.edit > 0" />
</el-form-item>
</el-col>
</el-row>