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

页面优化

Browse Source
This commit is contained in:
18188916393
2022-09-29 22:25:21 +08:00
parent 38121f3a57
commit d7ad5afbeb
18 changed files with 223 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java
View File

@@ -57,5 +57,11 @@ public class GroupInfoController {
public ResponseEntity<Object> queryInfoByCode() {
return new ResponseEntity<>(groupInfoService.queryInfoByCode(), HttpStatus.OK);
}
@PostMapping("/queryMaterial")
@Log("查询仓位物料")
@ApiOperation("查询仓位状态")
public ResponseEntity<Object> queryMaterial() {
return new ResponseEntity<>(groupInfoService.queryMaterial(), HttpStatus.OK);
}
}

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java
View File

@@ -33,5 +33,9 @@ public interface GroupInfoService {
* 根据仓位查询仓位信息
*/
JSONObject queryInfoByCode();
/**
* 查询仓位物料
*/
JSONObject queryMaterial();
}

18
wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.dis.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -49,11 +50,26 @@ public class GroupInfoServiceImpl implements GroupInfoService {
for (int i = 0; i < Arr.size(); i++) {
JSONObject structObj = Arr.getJSONObject(i);
String struct_code = structObj.getString("struct_code");
JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code",struct_code).process().uniqueResult(0);
JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code", struct_code).process().uniqueResult(0);
returnArr.put(structObj.getString("point_code"), jo);
}
return returnArr;
}
@Override
public JSONObject queryMaterial() {
JSONArray Arr = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "5").process().getResultJSONArray(0);
JSONObject returnArr = new JSONObject();
for (int i = 0; i < Arr.size(); i++) {
JSONObject structObj = Arr.getJSONObject(i);
String material_spec = structObj.getString("material_spec");
if (StrUtil.isEmpty(material_spec)) {
material_spec = "空" ;
}
returnArr.put(structObj.getString("point_code"), material_spec);
}
return returnArr;
}
}

9
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.sch.rest;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -102,4 +103,12 @@ public class PointController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("lock")
@Log("批量锁定")
@ApiOperation("批量锁定")
//@PreAuthorize("@el.check('point:add')")
public ResponseEntity<Object> lock(@RequestBody Map<String,Object> whereJson) {
pointService.lock(whereJson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
}

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

@@ -102,4 +102,11 @@ public interface PointService {
*/
void changeActive(JSONObject json);
/**
* 批量锁定
*
* @return Map<String, Object>
*/
Map<String, Object> lock(Map<String,Object> jsonObject);
}

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

@@ -183,5 +183,20 @@ public class PointServiceImpl implements PointService {
WQLObject.getWQLObject("sch_base_point").update(json);
}
@Override
public Map<String, Object> lock(Map<String, Object> map) {
JSONObject.toJSONString(map);
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(map));
JSONArray ja = jsonObject.getJSONArray("data");
WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
for (int i = 0; i < ja.size(); i++) {
String point_code = ja.getJSONObject(i).getString("point_code");
JSONObject jsonObject1 = point_table.query("point_code = '" + point_code + "'").uniqueResult(0);
jsonObject1.put("lock_type", "01");
point_table.update(jsonObject1);
}
return null;
}
}

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java
View File

@@ -50,6 +50,9 @@ public class DumpTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
//更新转储单的状态
JSONObject dumpObj = WQLObject.getWQLObject("st_buss_dumpinv").query("task_uuid='" + task_uuid + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(dumpObj)) {

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -44,6 +44,10 @@ public class InTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
//防止更新两次 导致库存信息不对
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
// 更新任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));

5
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java
View File

@@ -36,6 +36,9 @@ public class OutStByVehicleTask extends AbstractAcsTask {
//修改完成
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
//修改任务表状态
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
taskObj.put("update_by", SecurityUtils.getCurrentUsername());
taskObj.put("update_time", DateUtil.now());
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
@@ -46,7 +49,7 @@ public class OutStByVehicleTask extends AbstractAcsTask {
WQLObject st_buss_outStByVehicleTable = WQLObject.getWQLObject("st_buss_OutStByVehicle");
JSONObject billJo = st_buss_outStByVehicleTable.query("task_uuid='" + task_uuid + "'").uniqueResult(0);
billJo.put("bill_status", "03");
billJo.put("is_can_back","1");
billJo.put("is_can_back", "1");
st_buss_outStByVehicleTable.update(billJo);
//减少库存
JSONObject paramIvt = new JSONObject();

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -42,7 +42,9 @@ public class OutTask extends AbstractAcsTask {
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) {
return;
}
WQLObject dtltable = WQLObject.getWQLObject("st_buss_IOStoreDtl");
// 更新任务状态为完成
taskjo.put("task_status", TaskStatusEnum.FINISHED.getCode());

22
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql
View File

@@ -155,4 +155,24 @@
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
ENDIF
IF 输入.flag = "5"
QUERY
SELECT
point_code,
point_code AS struct_code,
point_name,
point_status,
material.material_uuid,
material.material_code,
material.material_spec
FROM
sch_base_point point
LEFT JOIN st_ivt_structivt ivt ON ivt.struct_uuid = point.point_uuid
LEFT JOIN md_base_material material ON material.material_uuid = ivt.material_uuid
WHERE
point.area_type IN ( '01', '02' )
ENDSELECT
ENDQUERY
ENDIF

2
wms/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: prod
jackson:
time-zone: GMT+8
data: