diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
index 7131531..8e2e88b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
@@ -14,11 +14,7 @@ import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
import org.jeecg.utils.HuahengJwtUtil;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author 游杰
@@ -33,9 +29,9 @@ public class ErpController extends HuahengBaseController {
@PostMapping("/receipt")
@ResponseBody
@ApiLogger(apiName = "入库单下发", from = "ERP")
- public Result receipt(@RequestBody ErpReceipt erpReceipt, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.receipt(erpReceipt, warehouseCode);
+ public Result receipt(@RequestBody ErpReceipt erpReceipt, @RequestHeader(value = "token", required = false) String token) {
+ String operator = HuahengJwtUtil.getAudienceByToken(token);
+ return erpService.receipt(erpReceipt, operator);
}
@PostMapping("/cancelReceipt")
@@ -43,16 +39,15 @@ public class ErpController extends HuahengBaseController {
@ApiLogger(apiName = "取消入库单", from = "ERP")
public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
String referCode = param.get("referCode");
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ String warehouseCode = param.get("warehouseCode");
return erpService.cancelReceipt(referCode, warehouseCode);
}
@PostMapping("/shipment")
@ResponseBody
@ApiLogger(apiName = "出库单下发", from = "ERP")
- public Result shipment(@RequestBody ErpShipment erpShipment, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.shipment(erpShipment, warehouseCode);
+ public Result shipment(@RequestBody ErpShipment erpShipment) {
+ return erpService.shipment(erpShipment);
}
@PostMapping("/cancelShipment")
@@ -60,7 +55,7 @@ public class ErpController extends HuahengBaseController {
@ApiLogger(apiName = "取消出库单", from = "ERP")
public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
String referCode = param.get("referCode");
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ String warehouseCode = param.get("warehouseCode");
return erpService.cancelShipment(referCode, warehouseCode);
}
@@ -75,8 +70,7 @@ public class ErpController extends HuahengBaseController {
@PostMapping("/addMaterial")
@ResponseBody
@ApiLogger(apiName = "增加物料", from = "ERP")
- public Result addMaterial(@RequestBody Material material, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.addMaterial(material, warehouseCode);
+ public Result addMaterial(@RequestBody Material material) {
+ return erpService.addMaterial(material);
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpReceiptHeader.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpReceiptHeader.java
index 2f28a0a..4e1a4cc 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpReceiptHeader.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpReceiptHeader.java
@@ -9,6 +9,10 @@ import lombok.Data;
public class ErpReceiptHeader {
/**
+ * 仓库编码
+ */
+ private String warehouseCode;
+ /**
* 货主
*/
private String companyCode;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java
index 6c61164..32d49c9 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java
@@ -6,6 +6,10 @@ import lombok.Data;
public class ErpShipmentHeader {
/**
+ * 仓库编码
+ */
+ private String warehouseCode;
+ /**
* 货主
*/
private String companyCode;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java
index 82f7faa..eb9d7a9 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java
@@ -13,7 +13,7 @@ public interface IErpService {
/**
* 下发入库单
*/
- public Result receipt(ErpReceipt erpReceipt, String warehouseCode);
+ public Result receipt(ErpReceipt erpReceipt, String operator);
/**
* 取消入库单
@@ -23,7 +23,7 @@ public interface IErpService {
/**
* 取消出库单
*/
- public Result shipment(ErpShipment erpShipment, String warehouseCode);
+ public Result shipment(ErpShipment erpShipment);
/**
* 取消出库单
@@ -38,7 +38,7 @@ public interface IErpService {
/**
* 增加物料信息
*/
- public Result addMaterial(Material material, String warehouseCode);
+ public Result addMaterial(Material material);
/**
* 回传入库单
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
index bbbe41a..f1c1240 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
@@ -10,16 +10,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.api.erp.entity.ErpBackReceipt;
-import org.jeecg.modules.wms.api.erp.entity.ErpBackShipment;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptDetail;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptHeader;
-import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
-import org.jeecg.modules.wms.api.erp.entity.ErpShipmentDetail;
-import org.jeecg.modules.wms.api.erp.entity.ErpShipmentHeader;
-import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
-import org.jeecg.modules.wms.api.erp.entity.InventorySummary;
+import org.jeecg.modules.wms.api.erp.entity.*;
import org.jeecg.modules.wms.api.erp.service.IErpService;
import org.jeecg.modules.wms.config.address.service.IAddressService;
import org.jeecg.modules.wms.config.company.entity.Company;
@@ -79,15 +70,8 @@ public class ErpServiceImpl implements IErpService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result receipt(ErpReceipt erpReceipt, String warehouseCode) {
+ public Result receipt(ErpReceipt erpReceipt, String operator) {
boolean success = false;
- if (StringUtils.isEmpty(warehouseCode)) {
- return Result.error("入库单下发，仓库编码为空");
- }
- Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
- if (warehouse == null) {
- return Result.error("入库单下发， 没有找到仓库");
- }
if (erpReceipt == null) {
return Result.error("入库单下发，没有传receipt");
}
@@ -99,11 +83,19 @@ public class ErpServiceImpl implements IErpService {
if (erpReceiptDetailList == null) {
return Result.error("入库单下发，没有传receiptDetailList");
}
+ String warehouseCode = erpReceiptHeader.getWarehouseCode();
String receiptType = erpReceiptHeader.getReceiptType();
String referCode = erpReceiptHeader.getReferCode();
String companyCode = erpReceiptHeader.getCompanyCode();
String remark = erpReceiptHeader.getRemark();
String supplierCode = erpReceiptHeader.getSupplierCode();
+ if (StringUtils.isEmpty(warehouseCode)) {
+ return Result.error("入库单下发，仓库编码为空");
+ }
+ Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+ if (warehouse == null) {
+ return Result.error("入库单下发， 没有找到仓库");
+ }
if (StringUtils.isEmpty(receiptType)) {
return Result.error("入库单下发， receiptType为空");
}
@@ -129,6 +121,7 @@ public class ErpServiceImpl implements IErpService {
receiptHeader.setReferCode(referCode);
receiptHeader.setSupplierCode(supplierCode);
receiptHeader.setRemark(remark);
+ receiptHeader.setCreateBy(operator);
Result result = receiptHeaderService.saveReceiptHeader(receiptHeader);
if (!result.isSuccess()) {
throw new ServiceException("创建入库单头失败" + result.getMessage());
@@ -181,6 +174,7 @@ public class ErpServiceImpl implements IErpService {
receiptDetail.setBatch(batch);
receiptDetail.setLot(lot);
receiptDetail.setProject(project);
+ receiptDetail.setCreateBy(operator);
success = receiptDetailService.save(receiptDetail);
if (!success) {
throw new ServiceException("入库单下发, 保存入库单详情失败");
@@ -206,7 +200,7 @@ public class ErpServiceImpl implements IErpService {
if (receiptHeader == null) {
return Result.error("入库单取消， 没有找到入库单");
}
- boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()),QuantityConstant.UPSTREAM_DELETE_RECEIPT);
+ boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()), QuantityConstant.UPSTREAM_DELETE_RECEIPT);
if (!success) {
return Result.error("入库单取消失败");
}
@@ -215,14 +209,7 @@ public class ErpServiceImpl implements IErpService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result shipment(ErpShipment erpShipment, String warehouseCode) {
- if (StringUtils.isEmpty(warehouseCode)) {
- return Result.error("出库单下发，仓库编码为空");
- }
- Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
- if (warehouse == null) {
- return Result.error("出库单下发， 没有找到仓库");
- }
+ public Result shipment(ErpShipment erpShipment) {
if (erpShipment == null) {
return Result.error("出库单下发，没有传shipment");
}
@@ -239,6 +226,14 @@ public class ErpServiceImpl implements IErpService {
String companyCode = erpShipmentHeader.getCompanyCode();
String remark = erpShipmentHeader.getRemark();
String customerCode = erpShipmentHeader.getCustomerCode();
+ String warehouseCode = erpShipmentHeader.getWarehouseCode();
+ if (StringUtils.isEmpty(warehouseCode)) {
+ return Result.error("出库单下发，仓库编码为空");
+ }
+ Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+ if (warehouse == null) {
+ return Result.error("出库单下发， 没有找到仓库");
+ }
if (StringUtils.isEmpty(shipmentType)) {
return Result.error("出库单下发， shipmentType为空");
}
@@ -387,22 +382,21 @@ public class ErpServiceImpl implements IErpService {
@Override
@Transactional(rollbackFor = Exception.class)
- public Result addMaterial(Material material, String warehouseCode) {
+ public Result addMaterial(Material material) {
if (StringUtils.isEmpty(material.getCode())) {
return Result.error("增加物料失败, 物料编码不能为空!!");
}
if (StringUtils.isEmpty(material.getName())) {
return Result.error("增加物料失败, 物料名称不能为空!!");
}
- if (StringUtils.isEmpty(warehouseCode)) {
+ if (StringUtils.isEmpty(material.getWarehouseCode())) {
return Result.error("增加物料失败, 仓库编码不能为空!!");
}
- Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+ Warehouse warehouse = warehouseService.getWarehouseByCode(material.getWarehouseCode());
if (warehouse == null) {
return Result.error("增加物料失败, 仓库为空!!");
}
- material.setWarehouseCode(warehouseCode);
material.setEnable(QuantityConstant.STATUS_ENABLE);
Material material1 = materialService.getMaterialByCode(material.getCode());
if (material1 != null) {
@@ -412,7 +406,7 @@ public class ErpServiceImpl implements IErpService {
if (!success) {
throw new ServiceException("增加物料失败, 保存时报错");
}
- return Result.error("增加物料成功");
+ return Result.ok("增加物料成功");
}
@Override
@@ -444,7 +438,7 @@ public class ErpServiceImpl implements IErpService {
if (!success) {
throw new ServiceException("回传入库单失败, 更新入库单头失败");
}
- receiptHeaderService.delMain(receiptHeader.getId().toString(),QuantityConstant.BACK_DELETE_RECEIPT);
+ receiptHeaderService.delMain(receiptHeader.getId().toString(), QuantityConstant.BACK_DELETE_RECEIPT);
return Result.ok("回传入库单成功");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
index d1f796d..6bddf93 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
@@ -16,11 +16,7 @@ import org.jeecg.modules.wms.api.mes.servuce.IMesService;
import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
import org.jeecg.utils.HuahengJwtUtil;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author 游杰
@@ -37,26 +33,25 @@ public class MesController extends HuahengBaseController {
@PostMapping("/receipt")
@ResponseBody
@ApiLogger(apiName = "入库单下发", from = "MES")
- public Result receipt(@RequestBody ErpReceipt erpReceipt, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.receipt(erpReceipt, warehouseCode);
+ public Result receipt(@RequestBody ErpReceipt erpReceipt, @RequestHeader(value = "token", required = false) String token) {
+ String operator = HuahengJwtUtil.getAudienceByToken(token);
+ return erpService.receipt(erpReceipt, operator);
}
@PostMapping("/cancelReceipt")
@ResponseBody
@ApiLogger(apiName = "取消入库单", from = "MES")
- public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
+ public Result cancelReceipt(@RequestBody Map<String, String> param) {
String referCode = param.get("referCode");
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.cancelReceipt(referCode, warehouseCode);
+ String warehouseCOde = param.get("warehouseCode");
+ return erpService.cancelReceipt(referCode, warehouseCOde);
}
@PostMapping("/shipment")
@ResponseBody
@ApiLogger(apiName = "出库单下发", from = "MES")
public Result shipment(@RequestBody ErpShipment erpShipment, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- return erpService.shipment(erpShipment, warehouseCode);
+ return erpService.shipment(erpShipment);
}
@PostMapping("/cancelShipment")
@@ -64,7 +59,7 @@ public class MesController extends HuahengBaseController {
@ApiLogger(apiName = "取消出库单", from = "MES")
public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
String referCode = param.get("referCode");
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+ String warehouseCode = param.get("warehouseCode");
return erpService.cancelShipment(referCode, warehouseCode);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
index b2ac2f6..616b8c6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
@@ -21,10 +21,8 @@ import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.ApiOperation;
-
@RestController
-@RequestMapping("/api/wms/v2")
+@RequestMapping("/api/wms")
public class WcsController extends HuahengBaseController {
@Resource
@@ -37,7 +35,6 @@ public class WcsController extends HuahengBaseController {
*/
@AutoLog(value = "WCS仓位分配")
@PostMapping("/warecellAllocation")
- @ApiOperation(value = "wcs仓位分配", notes = "wcs仓位分配", httpMethod = "POST")
@ResponseBody
@ApiLogger(apiName = "仓位分配", from = "WCS")
public Result warecellAllocation(@RequestBody WarecellDomain warecellDomain, HttpServletRequest req) {
@@ -54,7 +51,6 @@ public class WcsController extends HuahengBaseController {
if (StringUtils.isEmpty(warecellDomain.getHeight())) {
return Result.error("仓位分配， 高度为空");
}
- warecellDomain.setWarehouseCode(warehouseCode);
Result result = handleMultiProcess("warecellAllocation", new MultiProcessListener() {
@Override
public Result doProcess() {
@@ -71,7 +67,6 @@ public class WcsController extends HuahengBaseController {
*/
@AutoLog(value = "WCS申请空托盘组入库")
@PostMapping("/manyEmptyIn")
- @ApiOperation(value = "WCS申请空托盘组入库", notes = "WCS申请空托盘组入库", httpMethod = "POST")
@ResponseBody
@ApiLogger(apiName = "manyEmptyIn", from = "WCS")
public Result manyEmptyIn(@RequestBody ManyEmptyDomain manyEmptyDomain, HttpServletRequest req) {
@@ -97,7 +92,6 @@ public class WcsController extends HuahengBaseController {
*/
@AutoLog(value = "WCS申请空托盘组出库")
@PostMapping("/manyEmptyOut")
- @ApiOperation(value = "WCS申请空托盘组出库", notes = "WCS申请空托盘组出库", httpMethod = "POST")
@ResponseBody
@ApiLogger(apiName = "manyEmptyOut", from = "WCS")
public Result manyEmptyOut(@RequestBody ManyEmptyDomain manyEmptyDomain, HttpServletRequest req) {
@@ -120,7 +114,6 @@ public class WcsController extends HuahengBaseController {
*/
@AutoLog(value = "WCS任务完成")
@PostMapping("/completeTaskByWMS")
- @ApiOperation(value = "WCS任务完成", notes = "WCS任务完成", httpMethod = "POST")
@ResponseBody
@ApiLogger(apiName = "WCS任务完成", from = "WCS")
public Result completeTaskByWMS(@RequestBody TaskFinishEntity taskFinishEntity, HttpServletRequest req) {
@@ -141,7 +134,6 @@ public class WcsController extends HuahengBaseController {
*/
@AutoLog(value = "WCS设置物料信息")
@PostMapping("/setMaterialInfo")
- @ApiOperation(value = "WCS设置物料信息", notes = "WCS设置物料信息", httpMethod = "POST")
@ResponseBody
@ApiLogger(apiName = "WCS设置物料信息", from = "WCS")
public Result setMaterialInfo(@RequestBody MaterialInfoEntity materialInfoEntity) {
@@ -151,7 +143,6 @@ public class WcsController extends HuahengBaseController {
@AutoLog(value = "到达拣选台")
@PostMapping("/arrivedNotice")
- @ApiOperation("到达拣选台")
@ResponseBody
@ApiLogger(apiName = "到达拣选台", from = "WCS")
public Result arrivedNotice(@RequestBody Map<String, String> map, HttpServletRequest req) {
@@ -182,7 +173,6 @@ public class WcsController extends HuahengBaseController {
@AutoLog(value = "空出处理")
@PostMapping("/emptyOutHandle")
- @ApiOperation("空出处理")
@ResponseBody
@ApiLogger(apiName = "空出处理", from = "WCS")
public Result emptyOutHandle(@RequestBody Map<String, String> map) {
@@ -193,7 +183,6 @@ public class WcsController extends HuahengBaseController {
@AutoLog(value = "重入处理")
@PostMapping("/reentryHandle")
- @ApiOperation("重入处理")
@ResponseBody
@ApiLogger(apiName = "重入处理", from = "WCS")
public Result reentryHandle(@RequestBody Map<String, String> map) {
@@ -204,7 +193,6 @@ public class WcsController extends HuahengBaseController {
@AutoLog(value = "取货错处理")
@PostMapping("/pickupErrorHandle")
- @ApiOperation("取货错处理")
@ResponseBody
@ApiLogger(apiName = "取货错处理", from = "WCS")
public Result pickupErrorHandle(@RequestBody Map<String, String> map) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index 28440d9..9dca6a3 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -108,7 +108,7 @@ public class WcsServiceImpl implements WcsService {
return Result.error("分配库位时，根据任务号没有找到任务");
}
if (taskHeader.getStatus() == QuantityConstant.TASK_STATUS_COMPLETED) {
- return Result.error("任务已经完成，不能再分库位");
+ return Result.error("分配库位时，任务已经完成不能再分库位");
}
int taskType = taskHeader.getTaskType();
String containerCode = taskHeader.getContainerCode();
@@ -156,12 +156,18 @@ public class WcsServiceImpl implements WcsService {
locationCode =
locationAllocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, materialAreaCode);
if (StringUtils.isEmpty(locationCode)) {
- return Result.error("没有库位可分配");
+ return Result.error("分配库位时，没有库位可分配");
}
- locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+ boolean success = locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+ if (!success) {
+ throw new ServiceException("分配库位时，更新库位状态失败");
+ }
if (StringUtils.isNotEmpty(taskHeader.getToLocationCode()) && !locationCode.equals(taskHeader.getToLocationCode())) {
- locationService.updateStatus(taskHeader.getToLocationCode(), QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ success = locationService.updateStatus(taskHeader.getToLocationCode(), QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ if (!success) {
+ throw new ServiceException("分配库位时，更新之前分配的库位状态失败");
+ }
}
if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || taskType == QuantityConstant.TASK_TYPE_EMPTYRECEIPT) {
@@ -182,7 +188,7 @@ public class WcsServiceImpl implements WcsService {
ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
receiptContainerHeader.setToLocationCode(locationCode);
if (!receiptContainerHeaderService.updateById(receiptContainerHeader)) {
- throw new ServiceException("更新库位失败");
+ throw new ServiceException("分配库位时，更新入库组盘的库位号失败");
}
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/config/HuahengBatisInterceptor.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/config/HuahengBatisInterceptor.java
index 2b638c6..5bd73d1 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/config/HuahengBatisInterceptor.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/config/HuahengBatisInterceptor.java
@@ -25,10 +25,10 @@ public class HuahengBatisInterceptor implements Interceptor {
public Object intercept(Invocation invocation) throws Throwable {
MappedStatement mappedStatement = (MappedStatement)invocation.getArgs()[0];
String sqlId = mappedStatement.getId();
- log.debug("------sqlId------" + sqlId);
+// log.debug("------sqlId------" + sqlId);
SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
Object parameter = invocation.getArgs()[1];
- log.debug("------sqlCommandType------" + sqlCommandType);
+// log.debug("------sqlCommandType------" + sqlCommandType);
if (parameter == null) {
return invocation.proceed();
@@ -37,7 +37,7 @@ public class HuahengBatisInterceptor implements Interceptor {
LoginUser sysUser = this.getLoginUser();
Field[] fields = oConvertUtils.getAllFields(parameter);
for (Field field : fields) {
- log.debug("------field.name------" + field.getName());
+// log.debug("------field.name------" + field.getName());
try {
if ("createBy".equals(field.getName())) {
field.setAccessible(true);
@@ -106,7 +106,7 @@ public class HuahengBatisInterceptor implements Interceptor {
}
for (Field field : fields) {
- log.debug("------field.name------" + field.getName());
+// log.debug("------field.name------" + field.getName());
try {
if ("updateBy".equals(field.getName())) {
// 获取登录用户信息
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
index 10ca0ad..d16825f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
@@ -132,6 +132,14 @@ public class HuahengJwtUtil {
.withJWTId(UUID.randomUUID().toString()).sign(algorithm);
}
+ public static String getAudienceByToken(String token) {
+ RSA256Key rsa256Key = new RSA256Key(); // 获取公钥/私钥
+ Algorithm algorithm = Algorithm.RSA256(rsa256Key.getPublicKey(), rsa256Key.getPrivateKey());
+ JWTVerifier verifier = JWT.require(algorithm).withIssuer(HuahengJwtUtil.HUAHENG_SYSTEM_ID).build();
+ DecodedJWT jwt = verifier.verify(token);
+ return Arrays.toString(jwt.getAudience().toArray());
+ }
+
/**
* 获得token中的信息无需secret解密也能获得
* @return token中包含的用户名