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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-14 10:51:21 +08:00
parent 731bb22226 fc81b0fa90
commit 17853ca15e
30 changed files with 719 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.ext.sap.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
@@ -58,6 +59,8 @@ public class SapToLmsServiceImpl implements SapToLmsService {
jsonMst.put("detail_count",item.size());
jsonMst.put("bill_status","10");
jsonMst.put("create_mode","03");
jsonMst.put("biz_date", DateUtil.now());
jsonMst.put("user", "sap");
JSONArray tableData = new JSONArray();
@@ -91,8 +94,11 @@ public class SapToLmsServiceImpl implements SapToLmsService {
jsonMst.put("tableData", tableData);
if (StrUtil.equals(lfart, "ZLF")) {
// 调用出库新增
checkOutBillService.insertDtl(jsonMst);
// 调用出库新增并分配
String iostorinv_id = checkOutBillService.insertDtl(jsonMst);
JSONObject jsonObject = new JSONObject();
jsonObject.put("iostorinv_id",iostorinv_id);
checkOutBillService.allDiv(jsonObject);
result.put("RTYPE", "S");
result.put("RTMSG", "操作成功!");

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

@@ -86,7 +86,7 @@ public class OutTask extends AbstractAcsTask {
String currentUsername = SecurityUtils.getCurrentUsername();
// 更改任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
// jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("update_optid", currentUserId);
jsonTask.put("update_optname", currentUsername);
jsonTask.put("update_time", DateUtil.now());

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

@@ -794,7 +794,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
String sect_id = whereJson.getString("sect_id");
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + box_no + "' AND status < 2").uniqueResult(0);
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + box_no + "' AND status < 3").uniqueResult(0);
String material_code = sub_jo.getString("product_name");

8
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -349,6 +349,8 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
//定义返回数据
JSONObject ret = new JSONObject();
String is_task = jo_mst.getString("is_task");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
@@ -363,7 +365,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
Struct_map.put(storagevehicle_code, row);
}
if (i != 0) {
ids.append("','");
ids. append("','");
}
ids.append(storagevehicle_code);
}
@@ -400,8 +402,8 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
throw new BadRequestException(row.getString("turnin_struct_code") + "仓位数据异常，找不到对应点位！");
}
//判断是否已生成过了任务，无未生成则插入任务
JSONObject task = wo_Task.query("is_delete = '0' and taskdtl_type='07' and task_status='01' and start_point_code='" + jo.getString("start_point_code") + "'").uniqueResult(0);
if (task != null) {
JSONObject task = wo_Task.query("is_delete = '0' and task_status='04' and point_code1 ='" + jo.getString("start_point_code") + "'").uniqueResult(0);
if (task != null || is_task.equals("0")) {
jo.put("task_id", task.getString("task_id"));
} else {
task = new JSONObject();

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

@@ -963,11 +963,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
} else {//仓位载具扔有冻结数，需改任务类型为拣选出库
//任务号不为空
if (ObjectUtil.isNotEmpty(dis.getString("task_id"))) {
/* if (ObjectUtil.isNotEmpty(dis.getString("task_id"))) {
//更新对应任务为拣选出库
map.put("taskdtl_type", "05");
wo_Task.update(map, "task_id='" + dis.getString("task_id") + "'");
}
}*/
}
}
@@ -1139,13 +1139,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject mapParam = new JSONObject();// 生成移库单传入参数
JSONArray table = new JSONArray(); // 明细参数
mapParam.put("bill_status", "99");
mapParam.put("bill_status", "10");
mapParam.put("bill_type", "21");
mapParam.put("buss_type", "21");
mapParam.put("biz_date", DateUtil.today());
mapParam.put("stor_code", "CP01");
mapParam.put("stor_id", "1582991156504039424");
mapParam.put("stor_name", "成品仓库");
mapParam.put("is_task", "1");
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
@@ -1176,6 +1177,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMoveDtl.put("qty_unit_id", jsonMoveIvt.getLongValue("qty_unit_id"));
jsonMoveDtl.put("qty_unit_name", jsonMoveIvt.getString("unit_name"));
jsonMoveDtl.put("qty", jsonMoveIvt.getDoubleValue("canuse_qty"));
jsonMoveDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
jsonMoveDtl.put("turnin_sect_id", jsonMove.getLongValue("sect_id"));
jsonMoveDtl.put("turnin_sect_code", jsonMove.getString("sect_code"));
jsonMoveDtl.put("turnin_sect_name", jsonMove.getString("sect_name"));
@@ -1254,13 +1256,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject mapParam = new JSONObject();// 生成移库单传入参数
JSONArray table = new JSONArray(); // 明细参数
mapParam.put("bill_status", "99");
mapParam.put("bill_status", "10");
mapParam.put("bill_type", "21");
mapParam.put("buss_type", "21");
mapParam.put("biz_date", DateUtil.today());
mapParam.put("stor_code", "CP01");
mapParam.put("stor_id", "1582991156504039424");
mapParam.put("stor_name", "成品仓库");
mapParam.put("is_task", "1");
for (int i = 0; i < jsonAllBlockPoint.size(); i++) {
JSONObject json = jsonAllBlockPoint.getJSONObject(i);
@@ -1291,6 +1294,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonMoveDtl.put("qty_unit_id", jsonMoveIvt.getLongValue("qty_unit_id"));
jsonMoveDtl.put("qty_unit_name", jsonMoveIvt.getString("unit_name"));
jsonMoveDtl.put("qty", jsonMoveIvt.getDoubleValue("canuse_qty"));
jsonMoveDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
jsonMoveDtl.put("turnin_sect_id", jsonMove.getLongValue("sect_id"));
jsonMoveDtl.put("turnin_sect_code", jsonMove.getString("sect_code"));
jsonMoveDtl.put("turnin_sect_name", jsonMove.getString("sect_name"));