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;
}
@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("载具不能为空!");
}
// 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("仓位库存中的可用数跟桶记录表中的数量不一致！");
}*/
//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);

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

@@ -1,10 +1,10 @@
[交易说明]
交易名： 库区分页查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -28,26 +28,26 @@
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
@@ -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
@@ -248,4 +268,4 @@
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
ENDIF

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

13
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,14 +46,20 @@
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 输入.material_code <> ""
AcceptMark.mark_code like 输入.material_code
OPTION 输入.mark_code <> ""
AcceptMark.mark_code like 输入.mark_code
ENDOPTION
OPTION 输入.material_code <> ""
(mater.material_code like 输入.material_code or mater.material_name like 输入.material_code)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

Binary file not shown.