diff --git a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
index 646ed41..fa4b0fc 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
@@ -59,7 +59,7 @@
<ul id="info_list">
<li><span>库位：</span><input type="text" id="code" disabled/></li>
<li><span>容器编码：</span><input type="text" id="containerCode" disabled/></li>
- <li><span>物料信息：<select id="material" style="width: auto"><option>无</option></select></span></li>
+ <li><span>物料信息：<select id="material" style="width: auto; min-width: 200px;padding: 0px 8px;appearance: none;pointer-events: none;"><option>无</option></select></span></li>
</ul>
</div>
</form>
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
index c7ed5f5..2824275 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
@@ -37,23 +37,29 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
@Resource
private ITaskHeaderService taskHeaderService;
+
@Resource
private IReceiptContainerHeaderService receiptContainerHeaderService;
+
@Resource
private IShipmentCombinationService shipmentCombinationService;
+
@Resource
private IShipmentDetailService shipmentDetailService;
+
@Resource
private IInventoryDetailService inventoryDetailService;
+
@Resource
private IShipmentContainerHeaderService shipmentContainerHeaderService;
+
@Resource
private IMobileService mobileService;
+
@Resource
private IErpService erpService;
@Override
- @Transactional(rollbackFor = Exception.class)
public Result sendTaskToWcs(TaskHeader taskHeader) {
if (taskHeader == null) {
return Result.error("任务信息为空");
@@ -70,7 +76,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() {
@Override
@@ -82,7 +87,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result combination(CombinationModel combinationModel) {
Result result = handleMultiProcess("combination", new MultiProcessListener() {
@Override
@@ -94,7 +98,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result combination(CombinationParam combinationParam) {
Result result = handleMultiProcess("combination", new MultiProcessListener() {
@Override
@@ -113,7 +116,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result cancelCombine(Integer id) {
Result result = handleMultiProcess("cancelCombine", new MultiProcessListener() {
@Override
@@ -126,7 +128,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result autoCombination(String shipmentCode, String warehouseCode) {
Result result = handleMultiProcess("combination", new MultiProcessListener() {
@Override
@@ -139,7 +140,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
Result result = handleMultiProcess("createShipmentTask", new MultiProcessListener() {
@Override
@@ -152,7 +152,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result callBox(CallBoxBean bean, String warehouseCode) {
String lockKey = warehouseCode;
Result result = handleMultiProcess("callBox", lockKey, new MultiProcessListener() {
@@ -166,7 +165,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result quickReceipt(QuickReceiptBean bean, String warehouseCode) {
String lockKey = warehouseCode;
Result result = handleMultiProcess("quickReceipt", lockKey, new MultiProcessListener() {
@@ -180,7 +178,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result backReceipt(ReceiptHeader receiptHeader) {
Result result = handleMultiProcess("backReceipt", new MultiProcessListener() {
@Override
@@ -193,7 +190,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Result backShipment(ShipmentHeader shipmentHeader) {
Result result = handleMultiProcess("backShipment", new MultiProcessListener() {
@Override
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
index 85d95cc..3e5c69f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
@@ -141,7 +141,12 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
List<String> idList = Arrays.asList(ids.split(","));
List<Integer> idInterList = idList.stream().map(Integer::parseInt).collect(Collectors.toList());
- return shipmentContainerHeaderService.cancelCombine(idInterList);
+ Result result = null;
+ for (Integer id : idInterList) {
+ result = huahengMultiHandlerService.cancelCombine(id);
+ }
+ return result;
+// return shipmentContainerHeaderService.cancelCombine(idInterList);
}
/**
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/IShipmentContainerHeaderService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/IShipmentContainerHeaderService.java
index 7af682b..03f33a3 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/IShipmentContainerHeaderService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/IShipmentContainerHeaderService.java
@@ -50,11 +50,11 @@ public interface IShipmentContainerHeaderService extends IService<ShipmentContai
*/
Result cancelCombine(Integer id);
- /**
- * 取消配盘
- * @return
- */
- Result cancelCombine(List<Integer> ids);
+// /**
+// * 取消配盘
+// * @return
+// */
+// Result cancelCombine(List<Integer> ids);
/**
* 更新任务类型
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
index c35ffcb..412e987 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
@@ -238,16 +238,6 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result cancelCombine(List<Integer> ids) {
- Result result = null;
- for (Integer id : ids) {
- result = huahengMultiHandlerService.cancelCombine(id);
- }
- return result;
- }
-
- @Override
public boolean updateTaskTypeById(int taskType, int id) {
ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
shipmentContainerHeader.setTaskType(taskType);