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

优化

Browse Source
This commit is contained in:
zds
2022-11-15 21:30:50 +08:00
parent 328449b1cc
commit 0fe2c3c013
26 changed files with 424 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
View File

@@ -696,7 +696,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
if (StrUtil.isNotEmpty(bill_code)){
map.put("bill_code","%"+bill_code+"%");
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "material_code desc");
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "mst.input_time desc,material_code desc");
JSONObject returnjo = new JSONObject();
returnjo.put("code", "1");
returnjo.put("desc", "查询成功！");

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandPFOutIvtController.java
View File

@@ -49,5 +49,11 @@ public class HandPFOutIvtController {
return new ResponseEntity<>(handPFOutIvtService.backStore(whereJson), HttpStatus.OK);
}
@PostMapping("/queryStoragevehicle")
@Log("手持根据托盘查询单据")
@ApiOperation("手持根据托盘查询单据")
public ResponseEntity<Object> queryStoragevehicle(@RequestBody Map<String, String> whereJson) {
return new ResponseEntity<>(handPFOutIvtService.queryStoragevehicle(whereJson), HttpStatus.OK);
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandPFOutIvtService.java
View File

@@ -10,6 +10,13 @@ public interface HandPFOutIvtService {
* @return Map<String, Object>
*/
Map<String, Object> scanPoint(Map<String, String> jsonObject);
/**
*
* @param jsonObject
* @return
*/
Map<String, Object> queryStoragevehicle(Map<String, String> jsonObject);
/**
* 出库确认
*

24
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -83,16 +83,22 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
}
//3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误；
JSONArray bucketrow = WQL.getWO("QPADST_OUT_SERVICE").addParam("flag", "2").addParam("storagevehicle_code", storagevehicle_code).process().getResultJSONArray(0);
/* if (ObjectUtil.isEmpty(bucketrow)) {
throw new PdaRequestException("桶记录表没有载具为【'" + storagevehicle_code + "'】的信息！");
returnjo.put("code", "1");
returnjo.put("desc", "查询成功");
returnjo.put("result", bucketrow);
return returnjo;
}
// 4、判断【仓位库存表】与【桶记录表】库存中的数量是否一致，不一致则提示错误
String canuse_qty = ivtjo.getString("canuse_qty");
String storage_qty = bucketrow.getString("storage_qty");
BigDecimal flag = NumberUtil.sub(canuse_qty, storage_qty);
if (flag.doubleValue() != 0) {
throw new PdaRequestException("仓位库存中的可用数跟桶记录表中的数量不一致！");
}*/
@Override
public Map<String, Object> queryStoragevehicle(Map<String, String> jsonObject) {
JSONObject returnjo = new JSONObject();
String storagevehicle_code = jsonObject.get("storagevehicle_code");
if (StrUtil.isEmpty(storagevehicle_code)) {
throw new PdaRequestException("载具不能为空!");
}
//3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误；
JSONArray bucketrow = WQL.getWO("QPADST_OUT_SERVICE").addParam("flag", "44").addParam("storagevehicle_code", storagevehicle_code).process().getResultJSONArray(0);
returnjo.put("code", "1");
returnjo.put("desc", "查询成功");
returnjo.put("result", bucketrow);

20
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql
View File

@@ -184,6 +184,26 @@
ENDQUERY
ENDIF
IF 输入.flag = "44"
QUERY
SELECT
bucket.bucketunique,
material.material_code,
material.material_name,
bucket.pcsn,
bucket.storage_qty
FROM
MD_PB_BucketRecord bucket
LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id
where
1=1
OPTION 输入.storagevehicle_code <> ""
bucket.storagevehicle_code = 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "5"
QUERY
SELECT

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.basedata.master.service.impl;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
@@ -51,8 +52,14 @@ public class BagrecordServiceImpl implements BagrecordService {
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("begin_time", MapUtil.getStr(whereJson,"begin_time"));
map.put("end_time", MapUtil.getStr(whereJson,"end_time"));
String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
map.put("status", MapUtil.getStr(whereJson,"status"));
map.put("waste_type", MapUtil.getStr(whereJson,"waste_type"));
if (ObjectUtil.isNotEmpty(bag_id)) map.put("bag_id", "%"+bag_id+"%");

29
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java
View File

@@ -38,6 +38,7 @@ public class BucketrecordServiceImpl implements BucketrecordService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject sch_base_point = WQLObject.getWQLObject("sch_base_point");
String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time");
String storagevehicle_type = (String) whereJson.get("storagevehicle_type");
@@ -51,8 +52,12 @@ public class BucketrecordServiceImpl implements BucketrecordService {
String s = (String) whereJson.get("");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("begin_time", begin_time);
map.put("end_time", end_time);
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59");
}
map.put("storagevehicle_type", storagevehicle_type);
if (!ObjectUtil.isEmpty(bucketunique)) {
map.put("bucketunique", "%" + bucketunique + "%");
@@ -67,14 +72,32 @@ public class BucketrecordServiceImpl implements BucketrecordService {
if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\");
map.put("material_code", "%" + material_code + "%");
}
if (!ObjectUtil.isEmpty(point_code)) {
if (ObjectUtil.isNotEmpty(point_code)) {
map.put("point_code", "%" + point_code + "%");
map.put("flag", "1");
}else{
map.put("flag", "11");
}
if (!ObjectUtil.isEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
map.put("status", status);
JSONObject json = WQL.getWO("QMD_PB_BUCKETRECORD").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "br.bucketunique asc,br.storagevehicle_type asc");
if (ObjectUtil.isEmpty(point_code)) {
JSONArray ja = json.getJSONArray("content");
for(int i=0;i<ja.size();i++){
JSONObject jo = ja.getJSONObject(i);
String storagevehicle_code2 = jo.getString("storagevehicle_code");
if(ObjectUtil.isNotEmpty(storagevehicle_code2)){
JSONObject base_point = sch_base_point.query("vehicle_code='"+storagevehicle_code2+"'").uniqueResult(0);
jo.put("point_code",base_point.getString("point_code"));
}else{
jo.put("point_code","");
}
}
}
return json;
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BAGRECORD01.wql
View File

@@ -75,7 +75,7 @@
buck.pcsn AS buck_pcsn
FROM
MD_PB_BagRecord bag
LEFT JOIN md_me_materialbase mater1 ON bag.material_id = mater1.material_id
inner JOIN md_me_materialbase mater1 ON bag.material_id = mater1.material_id
LEFT JOIN MD_PB_BucketRecord buck ON bag.bucketunique = buck.bucketunique
LEFT JOIN md_me_materialbase mater2 ON buck.material_id = mater2.material_id
WHERE

74
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUCKETRECORD.wql
View File

@@ -75,8 +75,8 @@
point.point_code
FROM
MD_PB_BucketRecord br
LEFT JOIN md_me_materialbase mater ON br.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON br.qty_unit_id = unit.measure_unit_id
inner JOIN md_me_materialbase mater ON br.material_id = mater.material_id
inner JOIN md_pb_measureunit unit ON br.qty_unit_id = unit.measure_unit_id
LEFT JOIN sch_base_point point ON br.storagevehicle_code = point.vehicle_code and br.storagevehicle_code <> ''
WHERE
1=1
@@ -124,6 +124,76 @@
ENDPAGEQUERY
ENDIF
IF 输入.flag = "11"
PAGEQUERY
SELECT
br.bucket_record_id,
br.bucketunique,
br.storagevehicle_type,
br.pcsn,
br.ivt_level,
br.is_active,
br.quality_scode,
br.qty_unit_name,
br.storage_qty,
br.record_order,
br.bag_qty,
br.remark,
br.status,
br.create_name,
br.create_time,
br.storagevehicle_code,
br.print_type,
mater.material_code,
mater.material_name,
mater.ext_id
FROM
MD_PB_BucketRecord br
inner JOIN md_me_materialbase mater ON br.material_id = mater.material_id
inner JOIN md_pb_measureunit unit ON br.qty_unit_id = unit.measure_unit_id
WHERE
1=1
OPTION 输入.begin_time <> ""
br.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.create_id <> ""
br.create_name like 输入.create_id
ENDOPTION
OPTION 输入.pcsn <> ""
br.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.end_time <> ""
br.create_time <= 输入.end_time
ENDOPTION
OPTION 输入.storagevehicle_type <> ""
br.storagevehicle_type = 输入.storagevehicle_type
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
br.storagevehicle_code like 输入.storagevehicle_code
ENDOPTION
OPTION 输入.bucketunique <> ""
br.bucketunique like 输入.bucketunique
ENDOPTION
OPTION 输入.status <> ""
br.status = 输入.status
ENDOPTION
OPTION 输入.material_code <> ""
(mater.material_code like 输入.material_code or
mater.material_name like 输入.material_code )
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "2"
QUERY
SELECT

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/ql/service/impl/InspectionSchemeMstServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
import org.nl.wms.basedata.ql.service.InspectionSchemeMstService;
import org.nl.wms.basedata.ql.service.dto.InspectionSchemeMstDto;
@@ -43,7 +44,7 @@ public class InspectionSchemeMstServiceImpl implements InspectionSchemeMstServic
map.put("flag", "1");
map.put("inspection_scheme_type", whereJson.get("inspection_scheme_type"));
map.put("name", whereJson.get("name"));
JSONObject json = WQL.getWO("QL_InspectionSchemeMst_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("QL_InspectionSchemeMst_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "inspection_scheme_code asc,update_time desc");
return json;
}
@@ -78,8 +79,11 @@ public class InspectionSchemeMstServiceImpl implements InspectionSchemeMstServic
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String Inspection_scheme_code = CodeUtil.getNewCode("F_CODE");
dto.setInspection_scheme_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setInspection_scheme_code(Inspection_scheme_code);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/AcceptFormulaController.java
View File

@@ -73,8 +73,8 @@ public class AcceptFormulaController {
@Log("获取成型剂类别")
@ApiOperation("获取成型剂类别")
@GetMapping("/getBoms")
public ResponseEntity<Object> getBoms() {
return new ResponseEntity<>(acceptFormulaService.getBoms(),HttpStatus.OK);
public ResponseEntity<Object> getBoms(@RequestParam Map whereJson) {
return new ResponseEntity<>(acceptFormulaService.getBoms(whereJson),HttpStatus.OK);
}
@Log("获取成型剂类别")
@ApiOperation("获取成型剂类别")

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/AcceptFormulaService.java
View File

@@ -74,7 +74,7 @@ public interface AcceptFormulaService {
/**
* 提交
*/
JSONArray getBoms();
JSONArray getBoms(Map whereJson);
/**
* 提交
*/
@@ -82,7 +82,7 @@ public interface AcceptFormulaService {
/**
* 提交
*/
JSONArray getPCSNs(Map whereJson);
JSONObject getPCSNs(Map whereJson);
/**
* 提交

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

@@ -200,6 +200,11 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
JSONObject FactoryWarrantyMst = QL_TEST_FactoryWarrantyMst.query("inspection_id='"+inspection_id+"'").uniqueResult(0);
String material_pcsn = FactoryWarrantyMst.getString("pcsn");
now.put("material_id", jsonMst.getString("material_id"));
now.put("mark_id", jsonMst.getString("mark_id"));
now.put("accept_pcsn", jsonMst.getString("accept_pcsn"));
now.put("accept_qty", jsonMst.getString("accept_qty"));
now.put("remark", jsonMst.getString("remark"));
now.put("material_pcsn", material_pcsn);
now.put("update_optid", currentUserId);
now.put("update_optname", nickName);
@@ -274,8 +279,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
}
@Override
public JSONArray getBoms() {
HashMap<String, String> map = new HashMap<>();
public JSONArray getBoms(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
map.put("flag", "3");
JSONArray ret = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0);
return ret;
@@ -290,11 +295,24 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
}
@Override
public JSONArray getPCSNs(Map whereJson) {
public JSONObject getPCSNs(Map whereJson) {
WQLObject mstTab = WQLObject.getWQLObject("QL_TEST_AcceptMark");
HashMap<String, String> map = new HashMap<>(whereJson);
map.put("flag", "5");
JSONArray ret = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0);
return ret;
JSONArray ja = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0);
map.put("flag", "3");
JSONObject jo = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().uniqueResult(0);
JSONObject result = new JSONObject();
result.put("ja",ja);
result.put("jo",jo);
if(jo == null){
throw new BadRequestException("当前碳化钨无牌号可用！");
}else{
JSONObject jo2 = mstTab.query("is_delete = '0' and mark_id='"+jo.getString("id")+"'").uniqueResult(0);
result.put("jo2",jo2);
}
return result;
}
@Override
@@ -412,7 +430,9 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
// 厂家
JSONObject jsonFactMst = factMstTab.query("material_id = '" + jsonFormMst.getString("material_id") + "' and pcsn = '" + jsonFormMst.getString("material_pcsn") + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonFactMst)) oneMap.put("manufactor", jsonFactMst.getString("manufactor"));
if (ObjectUtil.isNotEmpty(jsonFactMst)) {
oneMap.put("manufactor", jsonFactMst.getString("manufactor"));
}
// 实验牌号
JSONObject jsonMark= markTab.query("mark_id = '" + jsonFormMst.getString("mark_id") + "' and is_delete = '0'").uniqueResult(0);

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java
View File

@@ -50,6 +50,14 @@ public class AcceptMarkServiceImpl implements AcceptMarkService {
}
map.put("material_code", "%"+material_code+"%");
}
String mark_code = (String) whereJson.get("mark_code");
if (!StrUtil.isEmpty(mark_code)) {
//处理转义字符
if (mark_code.contains("\\")) {
mark_code = mark_code.replace("\\", "\\\\\\");
}
map.put("mark_code", "%"+mark_code+"%");
}
map.put("flag", "1");
JSONObject json = WQL.getWO("QMD_PD_ACCEPTMARK01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
return json;
@@ -157,6 +165,8 @@ public class AcceptMarkServiceImpl implements AcceptMarkService {
now.put("ball_speed", jsonMst.getString("ball_speed"));
now.put("ball_time", jsonMst.getString("ball_time"));
now.put("remark", jsonMst.getString("remark"));
now.put("accept_qty", jsonMst.getString("accept_qty"));
now.put("material_id", jsonMst.getString("material_id"));
now.put("update_optid", currentUserId);
now.put("update_optname", nickName);
now.put("update_time", DateUtil.now());

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

@@ -104,12 +104,16 @@
SELECT
AcceptMark.mark_id AS id ,
AcceptMark.mark_code AS code ,
AcceptMark.accept_qty AS accept_qty ,
AcceptMark.mark_code AS name
FROM
QL_TEST_AcceptMark AcceptMark
WHERE
1 = 1
AND AcceptMark.is_delete = '0'
OPTION 输入.material_id <> ""
AcceptMark.material_id = 输入.material_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.material_code TYPEAS s_string
输入.mark_code TYPEAS s_string
输入.old_mark TYPEAS s_string
输入.is_used TYPEAS s_string
输入.mark_id TYPEAS s_string
@@ -45,13 +46,19 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
AcceptMark.*
AcceptMark.*,
mater.material_code,
mater.material_name
FROM
QL_TEST_AcceptMark AcceptMark
LEFT JOIN MD_ME_MaterialBase mater ON AcceptMark.material_id = mater.material_id
WHERE
AcceptMark.is_delete = '0'
OPTION 输入.mark_code <> ""
AcceptMark.mark_code like 输入.mark_code
ENDOPTION
OPTION 输入.material_code <> ""
AcceptMark.mark_code like 输入.material_code
(mater.material_code like 输入.material_code or mater.material_name like 输入.material_code)
ENDOPTION
ENDSELECT
ENDPAGEQUERY

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

Binary file not shown.

5
mes/qd/src/api/wms/pf/acceptformula.js
View File

@@ -45,10 +45,11 @@ export function getDtl(params) {
params
})
}
export function getBoms() {
export function getBoms(params) {
return request({
url: 'api/acceptformula/getBoms',
method: 'get'
method: 'get',
params
})
}
export function getTHWs() {

49
mes/qd/src/views/wms/basedata/master/bagrecord/index.vue
View File

@@ -11,34 +11,17 @@
label-width="80px"
label-suffix=":"
>
<!-- <el-form-item label="桶类型">
<label slot="label">桶&nbsp;&nbsp;类&nbsp;型:</label>
<el-select
v-model="query.storagevehicle_type"
clearable
size="mini"
placeholder="请选桶类型"
class="filter-item"
style="width: 230px;"
@change="hand"
>
<el-option
v-for="item in dict.MD_BUCKET_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="生成日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
@input="onInput()"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
@change="mytoQuery"
/>
</el-form-item>
@@ -214,6 +197,7 @@ import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import crudBucketrecord from "@/api/wms/basedata/master/bucketrecord";
import Date from '@/utils/datetime'
const defaultForm = { bagrecord_id: null, bag_id: null, material_id: null, pcsn: null, qty_unit_id: null, qty_unit_name: null, storage_qty: null, seqno: null, remark: null, waste_type: null, return_person: null, print_times: null, status: null, input_optid: null, input_optname: null, input_time: null, bucketunique: null, makeup_optid: null, makeup_optname: null, makeup_time: null, print_type: null }
export default {
@@ -248,20 +232,22 @@ export default {
{ 'code': '02', 'name': '组桶' },
{ 'code': '03', 'name': '清洗' }
],
open: true,
query_flag: true,
permission: {
},
rules: {
}}
},
created() {
this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
},
hand(value) {
@@ -288,6 +274,19 @@ export default {
})
}
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1){
if(array1 === null){
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
}else{
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
print: function() {
const _selectData = this.$refs.table.selection
for (let i = 0; i < _selectData.length; i++) {

31
mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue
View File

@@ -48,11 +48,12 @@
<el-date-picker
v-model="query.createTime"
type="daterange"
@input="onInput()"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
@change="mytoQuery"
/>
</el-form-item>
@@ -160,7 +161,7 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table :max-height="590" ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table ref="table" v-loading="crud.loading" :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column v-permission="['admin','productplanproc:edit','productplanproc:del']" fixed="right" label="操作" width="70px" align="center">
<template slot-scope="scope">
@@ -203,6 +204,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import Date from '@/utils/datetime'
const defaultForm = { bucket_record_id: null, bucketunique: null, storagevehicle_type: null, material_id: null, pcsn: null, ivt_level: null, is_active: null, quality_scode: null, qty_unit_id: null, qty_unit_name: null, storage_qty: null, record_order: null, bag_qty: null, remark: null, print_times: null, status: null, create_id: null, create_name: null, create_time: null, storagevehicle_id: null, storagevehicle_code: null, makeup_optid: null, makeup_optname: null, makeup_time: null, instor_optid: null, instor_optname: null, instor_time: null, outstor_optid: null, outstor_optname: null, outstor_time: null, instor_optid2: null, instor_optname2: null, instor_time2: null, print_type: null }
export default {
@@ -236,7 +238,7 @@ export default {
return {
StatusList: [],
TypeList: [],
open: true,
query_flag: true,
QualityList: [],
IvtList: [],
permission: {
@@ -258,15 +260,15 @@ export default {
crudBucketrecord.getIvtList().then(res => {
this.IvtList = res
})
this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
},
hand(value) {
@@ -300,6 +302,19 @@ export default {
}
}
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1){
if(array1 === null){
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
}else{
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
formatIsName(row, column) {
if (row.is_active === '1') {
return '是'

5
mes/qd/src/views/wms/basedata/ql/inspectionSchemeMst/index.vue
View File

@@ -85,7 +85,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="方案编码" prop="inspection_scheme_code">
<el-input v-model="form.inspection_scheme_code" style="width: 370px;" />
<el-input v-model="form.inspection_scheme_code" style="width: 370px;" :disabled="true" placeholder="系统生成" />
</el-form-item>
<el-form-item label="方案名称" prop="inspection_scheme_name">
<el-input v-model="form.inspection_scheme_name" style="width: 370px;" />
@@ -216,9 +216,6 @@ export default {
inspection_item_type: null,
permission: {},
rules: {
inspection_scheme_code: [
{ required: true, message: '检验方案编码不能为空', trigger: 'blur' }
],
inspection_scheme_name: [
{ required: true, message: '检验方案名称不能为空', trigger: 'blur' }
],

66
mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue
View File

@@ -1,8 +1,8 @@
<template>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
style="padding-top: 0px;"
title="小线试验维护"
v-loading.fullscreen.lock="fullscreenLoading"
:visible.sync="dialogVisible"
append-to-body
fullscreen
@@ -122,7 +122,7 @@
<el-input-number
v-model="form.CJZB00001"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
@@ -133,29 +133,15 @@
<el-input-number
v-model="form.CJZB00002"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-divider></el-divider>
<el-form-item label="验收牌号" prop="mark_id">
<el-select
v-model="form.mark_id"
placeholder="验收牌号"
style="width: 210px"
class="filter-item"
:disabled="crud.status.view > 0"
@change="storChange3"
>
<el-option
v-for="item in boms"
:key="item.id"
:label="item.code"
:value="item.id"
/>
</el-select>
<el-divider />
<el-form-item label="验收牌号" prop="mark_code">
<el-input v-model="form.mark_code" placeholder="验收牌号" style="width: 210px" disabled />
</el-form-item>
<el-form-item label="试验批号" prop="accept_pcsn">
<label slot="label">试验批号:</label>
@@ -224,7 +210,7 @@
<el-input-number
v-model="form.ball_time"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
@@ -304,6 +290,7 @@ const defaultForm = {
CJZB00004: 0,
CJZB00007: 0,
mark_id: '',
mark_code: '',
create_name: '',
create_time: (new Date()).strftime('%F', 'zh'),
accept_pcsn: '',
@@ -435,6 +422,7 @@ export default {
this.tableData = []
this.$emit('AddChanged')
this.$emit('update:dialogShow', false)
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
} else {
crudacceptformula.update(this.form).then(res => {
@@ -442,6 +430,7 @@ export default {
this.tableData = []
this.$emit('AddChanged')
this.$emit('update:dialogShow', false)
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
},
@@ -453,7 +442,18 @@ export default {
this.tableData = res
})
crudacceptformula.getPCSNs({ 'material_id': this.form.material_id }).then(res => {
this.PCSNs = res
this.PCSNs = res.ja
this.form.mark_id = res.jo.id
this.form.mark_code = res.jo.code
this.form.accept_qty = res.jo.accept_qty
this.form.c_balance = res.jo2.c_balance
this.form.ball_rate = res.jo2.ball_rate
this.form.liquid_rate = res.jo2.liquid_rate
this.form.ball_time = res.jo2.ball_time
this.form.ball_speed = res.jo2.ball_speed
this.form.ball_qty = this.form.ball_rate * this.form.accept_qty
this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty
})
crudacceptformula.getPCSNid(this.form).then(res => {
this.form.inspection_id = res.inspection_id
@@ -466,20 +466,11 @@ export default {
this.form.CJZB00004 = res.CJZB00004
this.form.manufactor = res.manufactor
})
crudacceptformula.getBom({ 'mark_id': this.form.mark_id }).then(res => {
this.form.c_balance = res.c_balance
this.form.ball_rate = res.ball_rate
this.form.liquid_rate = res.liquid_rate
this.form.ball_time = res.ball_time
this.form.ball_speed = res.ball_speed
this.form.ball_qty = this.form.ball_rate * this.form.accept_qty
this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty
})
}
},
storChange(row) {
crudacceptformula.getPCSNs({ 'material_id': row }).then(res => {
this.PCSNs = res
this.PCSNs = res.ja
this.form.inspection_id = ''
this.form.CJZB00007 = '0'
this.form.CJZB00001 = '0'
@@ -488,6 +479,17 @@ export default {
this.form.CJZB00021 = '0'
this.form.CJZB00020 = '0'
this.form.CJZB00004 = '0'
this.form.mark_id = res.jo.id
this.form.mark_code = res.jo.code
this.form.accept_qty = res.jo.accept_qty
this.form.c_balance = res.jo2.c_balance
this.form.ball_rate = res.jo2.ball_rate
this.form.liquid_rate = res.jo2.liquid_rate
this.form.ball_time = res.jo2.ball_time
this.form.ball_speed = res.jo2.ball_speed
this.form.ball_qty = this.form.ball_rate * this.form.accept_qty
this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty
})
},
storChange2(row) {

45
mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue
View File

@@ -109,7 +109,7 @@
<el-input-number
v-model="form.CJZB00001"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
@@ -120,7 +120,7 @@
<el-input-number
v-model="form.CJZB00002"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
@@ -128,21 +128,8 @@
</el-form-item>
</el-form>
<el-form ref="form2" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="150px" label-suffix=":">
<el-form-item label="验收牌号" prop="mark_id">
<el-select
v-model="form.mark_id"
placeholder="验收牌号"
style="width: 210px"
class="filter-item"
disabled
>
<el-option
v-for="item in boms"
:key="item.id"
:label="item.code"
:value="item.id"
/>
</el-select>
<el-form-item label="验收牌号" prop="mark_code">
<el-input v-model="form.mark_code" placeholder="验收牌号" style="width: 210px" disabled />
</el-form-item>
<el-form-item label="试验批号" prop="accept_pcsn">
<label slot="label">试验批号:</label>
@@ -210,7 +197,7 @@
<el-input-number
v-model="form.ball_time"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
@@ -341,7 +328,18 @@ export default {
this.tableData = res
})
crudacceptformula.getPCSNs({ 'material_id': this.form.material_id }).then(res => {
this.PCSNs = res
this.PCSNs = res.ja
this.form.mark_id = res.jo.id
this.form.mark_code = res.jo.code
this.form.accept_qty = res.jo.accept_qty
this.form.c_balance = res.jo2.c_balance
this.form.ball_rate = res.jo2.ball_rate
this.form.liquid_rate = res.jo2.liquid_rate
this.form.ball_time = res.jo2.ball_time
this.form.ball_speed = res.jo2.ball_speed
this.form.ball_qty = this.form.ball_rate * this.form.accept_qty
this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty
})
crudacceptformula.getPCSNid(this.form).then(res => {
this.form.inspection_id = res.inspection_id
@@ -354,15 +352,6 @@ export default {
this.form.CJZB00004 = res.CJZB00004
this.form.manufactor = res.manufactor
})
crudacceptformula.getBom({ 'mark_id': this.form.mark_id }).then(res => {
this.form.c_balance = res.c_balance
this.form.ball_rate = res.ball_rate
this.form.liquid_rate = res.liquid_rate
this.form.ball_time = res.ball_time
this.form.ball_speed = res.ball_speed
this.form.ball_qty = this.form.ball_rate * this.form.accept_qty
this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty
})
},
getSummaries(param) {
const { columns, data } = param

43
mes/qd/src/views/wms/pf/acceptmark/AddDialog.vue
View File

@@ -80,12 +80,37 @@
<el-input-number
v-model="form.total_value"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="标准重量(g)" prop="accept_qty">
<label slot="label">标准重量(g):</label>
<el-input-number
v-model="form.accept_qty"
:controls="false"
:precision="3"
:min="0"
style="width: 210px"
/>
</el-form-item>
<el-form-item label="对应碳化钨" prop="material_id">
<el-select
v-model="form.material_id"
placeholder="对应碳化钨"
style="width: 210px"
class="filter-item"
>
<el-option
v-for="item in THWs"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数">
<el-input v-model="form.tableData.length" :disabled="true" style="width: 210px;" />
</el-form-item>
@@ -164,14 +189,18 @@
<script>
import crudacceptformula from '@/api/wms/pf/acceptformula'
const defaultForm = {
mark_code: '',
material_id: '',
c_balance: 0,
liquid_rate: 0,
ball_rate: 0,
ball_speed: 0,
ball_time: 0,
detail_count: 0,
accept_qty: 1000,
material_code: '',
total_value: 0,
remark: '',
@@ -197,11 +226,18 @@ export default {
dialogVisible: false,
dtlMaterShow: false,
nowrow: {},
THWs: [],
nowindex: '',
rules: {
mark_code: [
{ required: true, message: '牌号不能为空', trigger: 'blur' }
],
material_id: [
{ required: true, message: '对应碳化钨不能为空', trigger: 'blur' }
],
accept_qty: [
{ required: true, message: '标准重量不能为空', trigger: 'blur' }
],
c_balance: [
{ required: true, message: '碳平衡不能为空', trigger: 'blur' }
],
@@ -227,6 +263,11 @@ export default {
}
}
},
created() {
crudacceptformula.getTHWs().then(res => {
this.THWs = res
})
},
methods: {
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {

36
mes/qd/src/views/wms/pf/acceptmark/ViewDialog.vue
View File

@@ -73,12 +73,39 @@
<el-input-number
v-model="form.total_value"
:controls="false"
:precision="4"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="标准重量(g)" prop="accept_qty">
<label slot="label">标准重量(g):</label>
<el-input-number
v-model="form.accept_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="对应碳化钨" prop="material_id">
<el-select
v-model="form.material_id"
placeholder="对应碳化钨"
style="width: 210px"
disabled
class="filter-item"
>
<el-option
v-for="item in THWs"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数">
<el-input v-model="tableData.length" disabled style="width: 210px;" />
</el-form-item>
@@ -122,6 +149,7 @@
import { crud } from '@crud/crud'
import crudacceptmark from '@/api/wms/pf/acceptmark'
import crudacceptformula from '@/api/wms/pf/acceptformula'
export default {
name: 'ViewDialog',
@@ -140,6 +168,7 @@ export default {
return {
dialogVisible: false,
form: {},
THWs: [],
tableData: []
}
},
@@ -155,6 +184,11 @@ export default {
}
}
},
created() {
crudacceptformula.getTHWs().then(res => {
this.THWs = res
})
},
methods: {
open() {
// 编辑之后获取明细

14
mes/qd/src/views/wms/pf/acceptmark/index.vue
View File

@@ -14,13 +14,22 @@
>
<el-form-item label="验收牌号">
<el-input
v-model="query.material_code"
v-model="query.mark_code"
size="mini"
clearable
placeholder="请输入验收牌号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="碳化钨">
<el-input
v-model="query.material_code"
size="mini"
clearable
placeholder="请输入碳化钨编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -47,6 +56,9 @@
<el-table-column prop="ball_rate" label="球料比" width="60" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_speed" label="球磨转速(RPM)" width="120px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_time" label="研磨时间(h)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="accept_qty" label="标准重量(g)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="material_code" label="碳化钨编码" width="120" align="center" />
<el-table-column prop="material_name" label="碳化钨名称" width="120" align="center" />
<el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
<el-table-column prop="remark" label="备注" align="center" min-width="135" />
<el-table-column prop="create_name" label="创建人" align="center" min-width="80" />