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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-31 20:41:22 +08:00
parent 1bade7dfa4
commit c99745bcf6
7 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -20,22 +20,29 @@ import org.springframework.stereotype.Component;
public class Init implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
// WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr");
/*WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr");
/*String now = DateUtil.now();
for (int i = 0; i < 10000; i++) {
String now = DateUtil.now();
for (int i = 1; i < 10000; i++) {
JSONObject json = new JSONObject();
json.put("struct_id", IdUtil.getSnowflake(1,1).nextId());
if (i > 10) {
json.put("struct_code", "01-"+"0"+i+"-01");
if (i < 10) {
json.put("struct_code", "01-"+"000"+i+"-01");
json.put("struct_name", "01排"+"000"+i+"列-01层");
}else if (i >= 10 && i < 100) {
json.put("struct_code", "01-"+"00"+i+"-01");
json.put("struct_name", "01排"+"00"+i+"列-01层");
}else if (i >= 100 && i < 1000) {
json.put("struct_code", "01-"+"0"+i+"-01");
json.put("struct_name", "01排"+"0"+i+"列-01层");
} else {
json.put("struct_code", "01-"+i+"-01");
json.put("struct_name", "01排"+i+"列-01层");
}
json.put("struct_name", "1排"+i+"列");
json.put("simple_name", "1排"+i+"列");
json.put("simple_name", json.getString("struct_name"));
json.put("sect_id", "1586913215886004224");
json.put("sect_code", "XN01");
json.put("sect_name", "虚拟区");

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java
View File

@@ -30,7 +30,7 @@ public class VirtualOutController {
private final VirtualOutService virtualOutService;
@PostMapping("/ivtQuery")
@PostMapping("/billQuery")
@Log("出库初始化查询")
@ApiOperation("出库初始化查询")
public ResponseEntity<Object> ivtQuery(@RequestBody JSONObject whereJson){
@@ -44,7 +44,7 @@ public class VirtualOutController {
return new ResponseEntity<>(virtualOutService.billType(whereJson),HttpStatus.OK);
}
@PostMapping("/ivtDisQuery")
@PostMapping("/ivtQuery")
@Log("分配明细查询")
@ApiOperation("分配明细查询")
public ResponseEntity<Object> ivtDisQuery(@RequestBody JSONObject whereJson){

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
View File

@@ -46,7 +46,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
@Override
public JSONObject billType(JSONObject whereJson) {
JSONArray resultJSONArray = WQLObject.getWQLObject("sys_dict_detail").query("name = 'ST_INV_OUT_TYPE'").getResultJSONArray(0);
JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "3").process().getResultJSONArray(0);
JSONObject jo = new JSONObject();
jo.put("rows", resultJSONArray);

15
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
View File

@@ -17,6 +17,7 @@
输入.bill_code TYPEAS s_string
输入.bill_type TYPEAS s_string
输入.material_code TYPEAS s_string
输入.box_no TYPEAS s_string
[临时表]
@@ -129,6 +130,20 @@
mater.material_code = 输入.material_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "3"
QUERY
SELECT
label,
value
FROM
sys_dict_detail
WHERE
name = 'ST_INV_OUT_TYPE'
ENDSELECT
ENDQUERY
ENDIF

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -393,6 +393,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
dtl.put("struct_code", ivt.getString("struct_code"));
dtl.put("struct_name", ivt.getString("struct_name"));
dtl.put("pcsn", ivt.getString("pcsn"));
dtl.put("box_no", ivt.getString("storagevehicle_code"));
dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id"));
dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code"));
dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type"));
@@ -752,6 +753,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
dtl.put("struct_code", ivt.getString("struct_code"));
dtl.put("struct_name", ivt.getString("struct_name"));
dtl.put("pcsn", ivt.getString("pcsn"));
dtl.put("box_no", ivt.getString("storagevehicle_code"));
dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id"));
dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code"));
dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type"));
@@ -899,6 +901,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject from_start = new JSONObject();
from_start.put("struct_id", dis.getString("struct_id"));
from_start.put("lock_type", "1");
from_start.put("storagevehicle_code", "");
// from_start.put("vehicle_code", "");
if ("02".equals(dis.getString("taskdtl_type"))) {
from_start.put("is_free", "1");
}

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -160,7 +160,7 @@
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
WHERE
1 = 1 and struct.lock_type='01'
1 = 1 and struct.lock_type='1'
and struct.struct_id in (
SELECT
dis.struct_id
@@ -217,7 +217,7 @@
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
WHERE
1 = 1 and struct.lock_type='00'
1 = 1 and struct.lock_type='1'
OPTION 输入.material_id <> ""
ivt2.material_id = 输入.material_id
ENDOPTION