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:
zhangzhiqiang
2023-04-14 11:13:56 +08:00
parent aa9be88be3
commit 729f61216a
34 changed files with 200 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/common/ConstantParam.java
View File

@@ -7,6 +7,9 @@ package org.nl.common;
public class ConstantParam {
//深坑清洗区域编码
public static String SK_REGION = "QSQX";
//发货区编码
public static String FHQ = "KQ001";
public static String RK_POINT = "A1_RK01";
//物料 数量/重量系数
public static Double MATERAIL_RATIO = 1.1;
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java
View File

@@ -64,6 +64,13 @@ public interface StructivtService {
*/
void deleteAll(Long[] ids);
/**
* 释放仓位
* @param point
* @param region
*/
void releasePoint(String point,String region);
JSONArray getStruct();
JSONObject getStructById(JSONObject param);

32
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.basedata.st.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -11,8 +12,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
@@ -29,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Date;
import java.util.stream.Collectors;
/**
* @description 服务实现
@@ -163,4 +168,31 @@ public class StructivtServiceImpl implements StructivtService {
return resultJSONArray;
}
@Override
@Transactional
public void releasePoint(String point, String region) {
WQLObject structTab = WQLObject.getWQLObject("st_ivt_structattr");
WQLObject vehicleextTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
Assert.notNull(region,"区域编码不能为空");
String sql = "sect_code = '"+region+"'";
if (!StringUtils.isEmpty(point)){
sql = sql+" and struct_code = '"+point+"'";
}
JSONArray array = structTab.query(sql).getResultJSONArray(0);
if (array.size() == 0){
throw new BadRequestException("当前区域点位不存在");
}
String vehicleCodes = array.stream().map(a -> ((JSONObject) a).getString("storagevehicle_code")).collect(Collectors.joining("','"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
//storagevehicle_id,storagevehicle_code,storagevehicle_qty,taskdtl_id,taskdtl_id,task_id,task_code
structTab.update(MapOf.of("lock_type", StatusEnum.LOCK_OFF.getCode(),"storagevehicle_id",""
,"storagevehicle_qty","0","storagevehicle_code",""
,"taskdtl_id","","task_id","","task_code",""
,"update_id",currentUserId,"update_name",nickName,"update_time",DateUtil.now()),sql
);
if (!StringUtils.isEmpty(vehicleCodes)){
vehicleextTab.delete("storagevehicle_code in ('"+vehicleCodes+"')");
}
}
}

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
View File

Binary file not shown.

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.ext.acs.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -54,6 +55,12 @@ public class AgvInstService {
@Autowired
private RedissonClient redissonClient;
public static void main(String[] args) {
String a = "HCX04JG04_SHCX04";
MD5 md5 = MD5.create();
System.out.println(md5.digest(a));
}
//满料请求点位确认
//1.判断当前设备路由表是否配置下一道路由设备，如果不是则说明直接到清洗
//2.是否设置人工搬运（人工搬运之后维护设备状态）
@@ -94,6 +101,7 @@ public class AgvInstService {
if (StringUtils.isBlank(nextPoint)){
throw new BadRequestException(OPT_NAME+"设备："+point_code+"没有可用点位");
}
basePoint.update(MapOf.of("lock_type",StatusEnum.LOCK_ON.getCode(),"point_code = '"+nextPoint+"'"));
task.put("vehicle_code",cacheVehile);
task.put("next_point_code",nextPoint);
task.put("task_status",StatusEnum.TASK_START_END_P.getCode());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql
View File

@@ -48,8 +48,10 @@
PAGEQUERY
SELECT
saleorder.*,
uuid() as order_line_code,
material.material_code,
material.material_name,
material.material_spec,
unit.unit_name
FROM
PCS_sale_order saleorder

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java
View File

@@ -79,6 +79,13 @@ public interface PointService {
*/
Map<String,Object> selectPoint(Map whereJson, Pageable page);
/**
* 获取所有点位
* @param region
* @return
*/
List<Map> selectPoint(String region);
/**
*
* 获取区域
@@ -96,4 +103,5 @@ public interface PointService {
* @param jsonObject
*/
void changeLock(JSONObject jsonObject);
}

32
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.sch.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -10,25 +11,28 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.ConstantParam;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.st.service.SectattrService;
import org.nl.wms.basedata.st.service.StructivtService;
import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.RegionService;
import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wms.sch.service.dto.RegionDto;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author ldjun
@@ -41,6 +45,7 @@ import java.util.Map;
public class PointServiceImpl implements PointService {
private final RegionService regionService;
private final StructivtService structivtService;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
HashMap map = new HashMap();
@@ -258,6 +263,25 @@ public class PointServiceImpl implements PointService {
return json;
}
@Override
public List<Map> selectPoint(String type) {
List list = new ArrayList<>();
Map<String, String> map = new HashMap<>();
map.put("text","ARK01");
map.put("value","A区入库01");
list.add(map);
if (!StringUtils.isEmpty(type)){
if (type.equals("1")){
JSONArray result = this.getPoint(MapOf.of("area_type", ConstantParam.RK_POINT));
}
if (type.equals("2")){
Pageable pageable =PageRequest.of(0,999);
Map<String, Object> stringObjectMap = structivtService.queryAll(MapOf.of("sect_id","1528631043496742912"), pageable);
}
}
return list;
}
@Override
public JSONArray getRegion() {
JSONArray resultJSONArray = WQLObject.getWQLObject("SCH_BASE_Region").query().getResultJSONArray(0);

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch_point.wql
View File

@@ -164,9 +164,10 @@
SELECT
GROUP_CONCAT(sch_base_task.task_id),
sch_base_point.vehicle_max_qty - ifnull( sum( sch_base_task.material_qty ), 0 ) - sch_base_point.vehicle_qty AS currentQty,
sch_base_point.*,
sch_base_point.*
from sch_base_point
left JOIN sch_base_task ON sch_base_point.point_code = point_code2 and task_status < 7
where 1=1
OPTION 输入.region_code <> ""
sch_base_point.region_code = 输入.region_code
ENDOPTION

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/ProductInService.java
View File

@@ -68,6 +68,8 @@ public interface ProductInService {
*/
void divPoint(JSONObject whereJson);
void createPdaTask(JSONObject whereJson);
void updateTask(Map whereJson);
void confirm(Map whereJson);

50
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/ProductInServiceImpl.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.st.in.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.unit.DataUnit;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -10,6 +12,8 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.enums.StatusEnum;
import org.nl.common.handler.LockProcess;
import org.nl.common.utils.RedissonUtils;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
@@ -70,7 +74,7 @@ public class ProductInServiceImpl implements ProductInService {
map.put("bill_type", "0001");
if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code","%"+bill_code+"%");
JSONObject jo = WQL.getWO("QST_IVT_PRODUCTIN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
JSONObject jo = WQL.getWO("QST_IVT_PRODUCTIN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
return jo;
}
@@ -136,9 +140,9 @@ public class ProductInServiceImpl implements ProductInService {
io_mst.put("detail_count", rows.size());
io_mst.put("remark", whereJson.get("remark"));
io_mst.put("bill_status", whereJson.getString("bill_status"));
io_mst.put("input_id", currentUserId + "");
io_mst.put("input_name", nickName);
io_mst.put("input_time", now);
io_mst.put("create_id", currentUserId + "");
io_mst.put("create_name", nickName);
io_mst.put("create_time", now);
io_mst.put("update_id", currentUserId + "");
io_mst.put("update_name", nickName);
io_mst.put("update_time", now);
@@ -384,7 +388,7 @@ public class ProductInServiceImpl implements ProductInService {
JSONObject jsonParam = new JSONObject();
JSONObject jsonPoint = new JSONObject();
if (whereJson.containsKey("sect_id")) {
jsonParam.put("sect_id", whereJson.get("sect_id"));
jsonParam.put("sect_code", whereJson.get("sect_code"));
jsonParam.put("stor_id", whereJson.get("stor_id"));
jsonParam.put("material_id", jsonDtl.getString("material_id"));
jsonPoint = this.autoDis(jsonParam);
@@ -607,6 +611,29 @@ public class ProductInServiceImpl implements ProductInService {
WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(point_map, "iostorinvdtl_id = '" + map.getString("iostorinvdtl_id") + "'");
}
//in_point data
@Override
public void createPdaTask(JSONObject param) {
Assert.notEmpty(new Object[]{param,param.getJSONArray("data")},"参数不能为空");
RedissonUtils.lock(() -> {
String point = param.getString("point");
String vehicle_code = param.getString("vehicle_code");
JSONArray data = param.getJSONArray("data");
//"data": [
// {
// "sale_code":"DD1213213",
// "order_line_code":"L_DD1213213",
// "material_spec":"SP/232",
// "in_qry": "123",
// "material_code": "24021962S",
// "material_name": "三通法兰"
// }
// ]
},"pda#createPdaTask",3);
}
@Override
public JSONObject autoDis(JSONObject whereJson) {
/*
@@ -620,7 +647,7 @@ public class ProductInServiceImpl implements ProductInService {
JSONObject struct_jo = new JSONObject();
String material_id = whereJson.getString("material_id");
String region_code = whereJson.getString("sect_id");
String sect_code = whereJson.getString("sect_code");
String product_area = whereJson.getString("stor_id");
JSONObject jsonMater = materTab.query("material_id = '" + material_id + "'").uniqueResult(0);
@@ -631,10 +658,9 @@ public class ProductInServiceImpl implements ProductInService {
double material_length_up = Double.valueOf(length_up);
if (material_length > material_length_up) {
// 超长：找一层两个货位
// 超长：找一层两个货位：超长判断
JSONArray pointArr = WQL.getWO("QST_IVT_DIS_01").addParam("flag", "1")
.addParam("region_code", region_code)
.addParam("product_area", product_area)
.addParam("sect_code", sect_code)
.process().getResultJSONArray(0);
for (int i = 0; i < pointArr.size(); i++) {
@@ -660,14 +686,12 @@ public class ProductInServiceImpl implements ProductInService {
if (material_weight > material_weight_up) {
// 超重: 尽量放在一层
struct_jo = WQL.getWO("QST_IVT_DIS_01").addParam("flag", "2")
.addParam("region_code", region_code)
.addParam("product_area", product_area)
.addParam("sect_code", sect_code)
.process().uniqueResult(0);
} else {
// 未超重: 尽量放在三层
struct_jo = WQL.getWO("QST_IVT_DIS_01").addParam("flag", "3")
.addParam("region_code", region_code)
.addParam("product_area", product_area)
.addParam("sect_code", sect_code)
.process().uniqueResult(0);
}
}

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/SemiProductInServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class SemiProductInServiceImpl implements SemiProductInService{
if(ObjectUtil.isNotEmpty(bill_code)) {
map.put("bill_code", "%" + bill_code + "%");
}
JSONObject jo = WQL.getWO("QST_IVT_PRODUCTIN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
JSONObject jo = WQL.getWO("QST_IVT_PRODUCTIN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
return jo;
}
@@ -289,9 +289,9 @@ public class SemiProductInServiceImpl implements SemiProductInService{
io_mst.put("product_name", json.getString("label"));
io_mst.put("detail_count", 1);
io_mst.put("bill_status", "10");
io_mst.put("input_id", currentUserId + "");
io_mst.put("input_name", nickName);
io_mst.put("input_time", now);
io_mst.put("create_id", currentUserId + "");
io_mst.put("create_name", nickName);
io_mst.put("create_time", now);
io_mst.put("update_id", currentUserId + "");
io_mst.put("update_name", nickName);
io_mst.put("update_time", now);
@@ -356,9 +356,9 @@ public class SemiProductInServiceImpl implements SemiProductInService{
io_mst.put("detail_count", rows.size());
io_mst.put("remark", whereJson.get("remark"));
io_mst.put("bill_status", whereJson.getString("bill_status"));
io_mst.put("input_id", currentUserId + "");
io_mst.put("input_name", nickName);
io_mst.put("input_time", now);
io_mst.put("create_id", currentUserId + "");
io_mst.put("create_name", nickName);
io_mst.put("create_time", now);
io_mst.put("update_id", currentUserId + "");
io_mst.put("update_name", nickName);
io_mst.put("update_time", now);

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/ProductOutServiceImpl.java
View File

@@ -165,9 +165,9 @@ public class ProductOutServiceImpl implements ProductOutService {
jsonMst.put("detail_count", array.size() + "");
jsonMst.put("bill_status", "10");
jsonMst.put("remark", map.getString("remark"));
jsonMst.put("input_id", currentUserId + "");
jsonMst.put("input_name", nickName);
jsonMst.put("input_time", now);
jsonMst.put("create_id", currentUserId + "");
jsonMst.put("create_name", nickName);
jsonMst.put("create_time", now);
jsonMst.put("update_id", currentUserId + "");
jsonMst.put("update_name", nickName);
jsonMst.put("update_time", now);
@@ -1203,7 +1203,7 @@ public class ProductOutServiceImpl implements ProductOutService {
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表
WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 实物仓库表
JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0);
String cust_code = jsonMst.getString("cust_code");

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/SemiProductOutServiceImpl.java
View File

@@ -166,9 +166,9 @@ public class SemiProductOutServiceImpl implements SemiProductOutService{
jsonMst.put("detail_count", array.size() + "");
jsonMst.put("bill_status", "10");
jsonMst.put("remark", map.getString("remark"));
jsonMst.put("input_id", currentUserId + "");
jsonMst.put("input_name", nickName);
jsonMst.put("input_time", now);
jsonMst.put("create_id", currentUserId + "");
jsonMst.put("create_name", nickName);
jsonMst.put("create_time", now);
jsonMst.put("update_id", currentUserId + "");
jsonMst.put("update_name", nickName);
jsonMst.put("update_time", now);
@@ -1204,7 +1204,7 @@ public class SemiProductOutServiceImpl implements SemiProductOutService{
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表
WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 实物仓库表
JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0);
String cust_code = jsonMst.getString("cust_code");

52
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_DIS_01.wql
View File

@@ -44,27 +44,23 @@
QUERY
SELECT
*,
region.region_name
region.sect_name
FROM
sch_base_point point
LEFT JOIN sch_base_region region ON point.region_code = region.region_code
st_ivt_structattr point
LEFT JOIN st_ivt_sectattr region ON point.sect_code = region.sect_code
WHERE
point.lock_type = '0'
AND point.point_status = '1'
AND point.is_delete = '0'
AND point.storagevehicle_code = ''
AND point.is_used = '1'
AND point.layer_num = '1'
AND left(point.simple_name,1) = '1'
AND IFNULL(point.control_point,'') <> ''
OPTION 输入.product_area <> ""
point.product_area = 输入.product_area
ENDOPTION
OPTION 输入.region_code <> ""
point.region_code = 输入.region_code
point.sect_code = 输入.sect_code
ENDOPTION
order by point.point_code ASC
order by point.struct_code ASC
ENDSELECT
ENDQUERY
@@ -73,26 +69,25 @@
IF 输入.flag = "2"
QUERY
SELECT
*,
region.region_name
FROM
sch_base_point point
LEFT JOIN sch_base_region region ON point.region_code = region.region_code
*,
region.sect_name
FROM
st_ivt_structattr point
LEFT JOIN st_ivt_sectattr region ON point.sect_code = region.sect_code
WHERE
point.lock_type = '0'
AND point.point_status = '1'
AND point.is_delete = '0'
AND point.is_used = '1'
AND point.storagevehicle_code = ''
OPTION 输入.product_area <> ""
point.product_area = 输入.product_area
ENDOPTION
OPTION 输入.region_code <> ""
point.region_code = 输入.region_code
point.sect_code = 输入.sect_code
ENDOPTION
order by point.layer_num ASC,point.point_code ASC
order by left(point.simple_name,1) ASC,point.struct_code ASC
ENDSELECT
ENDQUERY
@@ -102,25 +97,24 @@
QUERY
SELECT
*,
region_name
region.sect_name
FROM
sch_base_point point
LEFT JOIN sch_base_region region ON point.region_code = region.region_code
st_ivt_structattr point
LEFT JOIN st_ivt_sectattr region ON point.sect_code = region.sect_code
WHERE
point.lock_type = '0'
AND point.point_status = '1'
AND point.is_delete = '0'
point.lock_type = '0'
AND point.is_used = '1'
AND point.storagevehicle_code = ''
OPTION 输入.product_area <> ""
point.product_area = 输入.product_area
ENDOPTION
OPTION 输入.region_code <> ""
point.region_code = 输入.region_code
point.sect_code = 输入.sect_code
ENDOPTION
order by point.layer_num DESC,point.point_code ASC
order by left(point.simple_name,1) DESC,point.struct_code ASC
ENDSELECT
ENDQUERY
@@ -201,4 +195,4 @@
order by point.struct_code DESC
ENDSELECT
ENDQUERY
ENDIF
ENDIF

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_PRODUCTIN_01.wql
View File

@@ -61,11 +61,11 @@
ENDOPTION
OPTION 输入.begin_time <> ""
input_time <= 输入.begin_time
create_time <= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
input_time >= 输入.end_time
create_time >= 输入.end_time
ENDOPTION
OPTION 输入.bill_status <> ""
@@ -166,4 +166,4 @@
ENDSELECT
ENDQUERY
ENDIF
ENDIF

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_PRODUCTOUT_01.wql
View File

@@ -64,11 +64,11 @@
ENDOPTION
OPTION 输入.begin_time <> ""
input_time <= 输入.begin_time
create_time <= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
input_time >= 输入.end_time
create_time >= 输入.end_time
ENDOPTION
OPTION 输入.bill_status <> ""

2
mes/qd/src/mixins/crud.js
View File

@@ -58,7 +58,7 @@ export default {
}
return new Promise((resolve, reject) => {
this.loading = true
debugger
// 请求数据
initData(this.url, this.getQueryParame()).then(data => {
this.total = data.totalElements

2
mes/qd/src/views/wms/basedata/master/class/index.vue
View File

@@ -386,7 +386,7 @@ export default {
}
const dafult = this.$el.getElementsByClassName('dafult')
for (let a = 0; a < dafult.length; a++) {
debugger
dafult[a].click()
}
}

2
mes/qd/src/views/wms/basedata/master/material/Dialog.vue
View File

@@ -78,7 +78,7 @@ export default {
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]

2
mes/qd/src/views/wms/mps/produce/AddDialog.vue
View File

@@ -295,7 +295,7 @@ export default {
this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
},
clickRow(row) {
debugger
this.current_row = row
},
dateFormatter(str) {

2
mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue
View File

@@ -74,7 +74,7 @@ export default {
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]

2
mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
View File

@@ -74,7 +74,7 @@ export default {
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]

2
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -321,7 +321,7 @@ export default {
return is_used === '1'
},
changeEnabled(data, val) {
debugger
this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.device_code + ', 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

2
mes/qd/src/views/wms/pub/PointDialog.vue
View File

@@ -153,7 +153,7 @@ export default {
this.query.is_lock = '1'
this.query.lock_type = this.lock
this.query.is_used = '1'
debugger
this.query.stor_id = this.storId
this.crud.toQuery()
},

4
mes/qd/src/views/wms/pub/StructDialog.vue
View File

@@ -116,7 +116,7 @@ export default {
},
sectProp: {
handler(newValue, oldValue) {
debugger
this.sect = newValue
}
}
@@ -156,7 +156,7 @@ export default {
this.query.is_lock = '1'
this.query.lock_type = this.lock
this.query.is_used = '1'
debugger
this.query.stor_id = this.storId
this.crud.toQuery()
},

2
mes/qd/src/views/wms/sch/point/index.vue
View File

@@ -632,7 +632,7 @@ export default {
})
},
toView(row) {
debugger
if (row) {
this.$refs.viewDialog.setParentData(row)
}

2
mes/qd/src/views/wms/st/in/EndPointDialog.vue
View File

@@ -121,7 +121,7 @@ export default {
},
open() {
console.log(this.openParam)
debugger
this.query.material_id = this.openParam.material_id
this.query.area_type = this.openParam.area_type
this.query.vehicle_code = this.openParam.vehicle_code

2
mes/qd/src/views/wms/st/in/index.vue
View File

@@ -683,7 +683,7 @@ export default {
})
},
getEndPoint(material_id, end_area, vehicle_code, qty) {
debugger
const material = { material_id: material_id, area_type: end_area, vehicle_code: vehicle_code, qty: qty }
this.openParam = material
console.log(this.openParam)

2
mes/qd/src/views/wms/st/productIn/AddDtl.vue
View File

@@ -167,7 +167,7 @@ export default {
this.$emit('update:dialogShow', false)
},
submit() {
debugger
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
crudProductIn.queryBoxMater(this.rows).then(res => {

2
mes/qd/src/views/wms/st/productIn/ViewDialog.vue
View File

@@ -241,7 +241,7 @@ export default {
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
debugger
this.tabledis = res
}).catch(() => {
this.tabledis = []

10
mes/qd/src/views/wms/st/productIn/index.vue
View File

@@ -80,7 +80,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.bill_type"
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -145,8 +145,8 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="制单人" align="center" prop="input_name" />
<el-table-column label="制单时间" align="center" prop="input_time" width="150" />
<el-table-column label="制单人" align="center" prop="create_name" />
<el-table-column label="制单时间" align="center" prop="create_time" width="150" />
<el-table-column label="修改人" align="center" prop="update_name" />
<el-table-column label="修改时间" align="center" prop="update_time" width="150" />
<el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
@@ -201,7 +201,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -279,7 +279,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.bill_type[row.bill_type]
return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row

2
mes/qd/src/views/wms/st/productOut/AddDialog.vue
View File

@@ -317,7 +317,7 @@ export default {
},
tableChanged5(rows) {
rows.forEach((item) => {
debugger
if (this.form.tableData.length !== 0) {
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {

14
mes/qd/src/views/wms/st/productOut/index.vue
View File

@@ -67,7 +67,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.bill_type"
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -150,9 +150,9 @@
<el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
<el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
<el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
<el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_name" />
<el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />
<el-table-column show-overflow-tooltip label="修改人" align="center" prop="update_name" />
<el-table-column show-overflow-tooltip label="制单人" align="center" prop="create_name" />
<el-table-column show-overflow-tooltip label="制单时间" align="center" prop="create_time" width="140" />
<el-table-column show-overflow-tooltip label="修改人" align="center" prop="create_name" />
<el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
<el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_name" />
<el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
@@ -195,7 +195,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -278,7 +278,7 @@ export default {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
bill_typeFormat(row) {
return this.dict.label.bill_type[row.bill_type]
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
},
handleCurrentChange(current) {
if (current === null) {
@@ -293,7 +293,7 @@ export default {
},
divOpen() {
productOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
debugger
this.openParam = res
this.storId = this.currentRow.product_code
this.divShow = true