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

add：二期出库

Browse Source
This commit is contained in:
liuxy
2024-01-24 14:01:54 +08:00
parent d93fe3a4ed
commit b3da793a4c
21 changed files with 2442 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
View File

@@ -19,7 +19,8 @@ public enum RegionTypeEnum {
LKRK("16", "密集库入库输送线", "1585164789083148288"),
LKCK("17", "密集库出库输送线", "1585167595403874304"),
XN01("18", "虚拟区", "1586913215886004224"),
PD01("19", "盘点区", "1645705331612979200");
PD01("19", "盘点区", "1645705331612979200"),
TWO_ZZ01("20", "暂存区", "");
private String name;
private String code;

27
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.st.instor.task;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -120,7 +121,31 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
*/
@Override
public String createTask(JSONObject form) {
return null;
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();
JSONObject json = new JSONObject();
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_name", form.getString("task_name"));
json.put("point_code1", form.getString("point_code1"));
json.put("point_code2", form.getString("point_code2"));
json.put("material_id", form.getString("material_id"));
json.put("task_group_id", form.getString("task_group_id"));
json.put("sort_seq", form.getString("sort_seq"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("handle_class", THIS_CLASS);
json.put("create_id", currentUserId);
json.put("create_name", currentUsername);
json.put("create_time", DateUtil.now());
json.put("acs_task_type", "7");
WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
return json.getString("task_id");
}
/**

67
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
View File

@@ -3,8 +3,11 @@ package org.nl.wms.st.outbill.rest;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -20,8 +23,17 @@ import java.util.Map;
@RequestMapping("/api/checkoutbill")
@Slf4j
public class CheckOutBillController {
/**
* 一期出库服务
*/
private final CheckOutBillService checkOutBillService;
/**
* 二期出出库服务
*/
@Autowired
private IStIvtIostorinvOutService iStIvtIostorinvOutService;
@GetMapping
@Log("查询出库单")
@@ -58,7 +70,8 @@ public class CheckOutBillController {
//@PreAuthorize("@el.check('checkoutbill:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
checkOutBillService.deleteAll(ids);
iStIvtIostorinvOutService.deleteAll(ids);
// checkOutBillService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -66,7 +79,8 @@ public class CheckOutBillController {
@Log("修改出库单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
checkOutBillService.update(whereJson);
iStIvtIostorinvOutService.update(whereJson);
// checkOutBillService.update(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -74,7 +88,8 @@ public class CheckOutBillController {
@Log("新增出库单")
public ResponseEntity<Object> insertDtl(@RequestBody JSONObject whereJson) {
checkOutBillService.insertDtl(whereJson);
iStIvtIostorinvOutService.insertMst(whereJson);
// checkOutBillService.insertDtl(whereJson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@@ -82,7 +97,11 @@ public class CheckOutBillController {
@Log("出库单全部分配")
public ResponseEntity<Object> allDiv(@RequestBody JSONObject whereJson) {
checkOutBillService.allDiv(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.allDiv(whereJson);
} else {
checkOutBillService.allDiv(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -90,7 +109,12 @@ public class CheckOutBillController {
@Log("出库单全部分2配")
public ResponseEntity<Object> allDivOne(@RequestBody JSONObject whereJson) {
checkOutBillService.allDivOne(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.allDiv(whereJson);
} else {
checkOutBillService.allDivOne(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -98,7 +122,11 @@ public class CheckOutBillController {
@Log("出库单全部取消")
public ResponseEntity<Object> allCancel(@RequestBody JSONObject whereJson) {
checkOutBillService.allCancel(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.cancelDiv(whereJson);
} else {
checkOutBillService.allCancel(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -114,7 +142,12 @@ public class CheckOutBillController {
@Log("出库单全部取消")
public ResponseEntity<Object> oneCancel(@RequestBody JSONObject whereJson) {
checkOutBillService.oneCancel(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.cancelDiv(whereJson);
} else {
checkOutBillService.oneCancel(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -167,7 +200,12 @@ public class CheckOutBillController {
@Log("一键设置")
public ResponseEntity<Object> allSetPoint(@RequestBody JSONObject whereJson) {
checkOutBillService.allSetPoint(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.allSetPoint(whereJson);
} else {
checkOutBillService.allSetPoint(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -196,7 +234,12 @@ public class CheckOutBillController {
@Log("出库单手动分配")
public ResponseEntity<Object> manualDiv(@RequestBody JSONObject whereJson) {
checkOutBillService.manualDiv(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.manualDiv(whereJson);
} else {
checkOutBillService.manualDiv(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@@ -204,7 +247,11 @@ public class CheckOutBillController {
@Log("出库单强制确认")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
checkOutBillService.confirm(whereJson);
if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {
iStIvtIostorinvOutService.confirm(whereJson);
} else {
checkOutBillService.confirm(whereJson);
}
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}