diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
index 5152cb5..75d94d5 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
@@ -154,6 +154,10 @@
</a-tag>
</span>
+ <span slot="reason" slot-scope="reason">
+ <span v-html="solutionReason(reason)"></span>
+ </span>
+
<template slot='htmlSlot' slot-scope='text'>
<div v-html='text'></div>
@@ -292,6 +296,12 @@ export default {
dataIndex: 'remark'
},
{
+ title: '原因',
+ align: 'center',
+ dataIndex: 'reason',
+ scopedSlots: {customRender: 'reason'}
+ },
+ {
title: '创建人',
align: 'center',
dataIndex: 'createBy'
@@ -465,6 +475,15 @@ export default {
}
})
return actions.join('')
+ },
+ solutionReason(value){
+ if (value == 'WMS删除') {
+ return '<span style="color:black">WMS删除</span>'
+ } else if (value == '上游删除') {
+ return '<span style="color:#0e36b9">上游删除</span>'
+ } else if (value == '回传删除') {
+ return '<span style="color:green">回传删除</span>'
+ }
}
}
}
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 91e5d7e..bbbe41a 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
@@ -34,6 +34,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptHeaderHistoryService;
import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
@@ -62,6 +63,8 @@ public class ErpServiceImpl implements IErpService {
@Resource
private IReceiptHeaderService receiptHeaderService;
@Resource
+ private IReceiptHeaderHistoryService receiptHeaderHistoryService;
+ @Resource
private IShipmentHeaderService shipmentHeaderService;
@Resource
private IMaterialService materialService;
@@ -203,7 +206,7 @@ public class ErpServiceImpl implements IErpService {
if (receiptHeader == null) {
return Result.error("入库单取消， 没有找到入库单");
}
- boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()));
+ boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()),QuantityConstant.UPSTREAM_DELETE_RECEIPT);
if (!success) {
return Result.error("入库单取消失败");
}
@@ -441,6 +444,7 @@ public class ErpServiceImpl implements IErpService {
if (!success) {
throw new ServiceException("回传入库单失败, 更新入库单头失败");
}
+ 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/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
index 1472658..a472730 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -134,7 +134,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@RequiresPermissions("receiptHeader:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- receiptHeaderService.delMain(id);
+ receiptHeaderService.delMain(id,QuantityConstant.WMS_DELETE_RECEIPT);
return Result.OK("删除成功!");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
index 887da8a..63f04e2 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
@@ -17,9 +17,9 @@ import java.util.List;
public interface IReceiptHeaderService extends IService<ReceiptHeader> {
/**
- * 删除一对多
+ * 删除一对多 reason进入历史单据的原因
*/
- public boolean delMain(String id);
+ public boolean delMain(String id,String reason);
/**
* 批量删除一对多
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
index 2426bb3..8332204 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
@@ -52,15 +52,21 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, R
@Resource
private IReceiptHeaderHistoryService receiptHeaderHistoryService;
+ /**
+ * @param id 入库单主表id
+ * @param reason 进入历史单据的原因
+ * @return
+ */
@Override
@Transactional
- public boolean delMain(String id) {
+ public boolean delMain(String id,String reason) {
ReceiptHeader receiptHeader = getById(id);
if (receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
throw new ServiceException("不能删除非新建状态单据");
}
- receiptHeaderHistoryService.saveById(id);
+ receiptHeaderHistoryService.saveById(id,reason);
boolean success = receiptDetailMapper.deleteByMainId(id);
+
if (!success) {
return success;
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/entity/ReceiptHeaderHistory.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/entity/ReceiptHeaderHistory.java
index b72a9f6..23c33bc 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/entity/ReceiptHeaderHistory.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/entity/ReceiptHeaderHistory.java
@@ -76,6 +76,10 @@ public class ReceiptHeaderHistory implements Serializable {
@Excel(name = "入库单备注", width = 15)
@ApiModelProperty(value = "入库单备注")
private String remark;
+ /** 来源信息 */
+ @Excel(name = "来源信息", width = 15)
+ @ApiModelProperty(value = "来源信息")
+ private String reason;
/** 备用字段1 */
@Excel(name = "备用字段1", width = 15)
@ApiModelProperty(value = "备用字段1")
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/IReceiptHeaderHistoryService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/IReceiptHeaderHistoryService.java
index 8ab587a..e278f7b 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/IReceiptHeaderHistoryService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/IReceiptHeaderHistoryService.java
@@ -29,6 +29,7 @@ public interface IReceiptHeaderHistoryService extends IService<ReceiptHeaderHist
/**
* 根据删除的入库单主表ID新增历史入库单记录
* @param id
+ * @param reason 进入历史单据的原因
*/
- void saveById(String id);
+ void saveById(String id,String reason);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
index 490527b..600f696 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
@@ -68,9 +68,10 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl<ReceiptHeaderHi
/**
* 根据删除的入库单主表ID新增历史入库单记录
* @param id
+ * @param reason 进入历史单据的原因
*/
@Override
- public void saveById(String id) {
+ public void saveById(String id,String reason) {
ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
receiptHeaderHistory.setCode(receiptHeader.getCode());
@@ -84,6 +85,7 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl<ReceiptHeaderHi
receiptHeaderHistory.setTotalqty(receiptHeader.getTotalqty());
receiptHeaderHistory.setTotallines(receiptHeader.getTotallines());
receiptHeaderHistory.setRemark(receiptHeader.getRemark());
+ receiptHeaderHistory.setReason(reason);
receiptHeaderHistory.setUserdef1(receiptHeader.getUserdef1());
receiptHeaderHistory.setUserdef2(receiptHeader.getUserdef2());
receiptHeaderHistory.setUserdef3(receiptHeader.getUserdef3());
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
index 3abd4a2..5b607fe 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -707,4 +707,10 @@ public class QuantityConstant {
public static final String ERP_PASSWORD = "123123";
public static final String ERP_LCID = "2052";
public static final String ERP_ServerUrl = "http://erptest.gani.com.cn/K3Cloud/";
+
+ public static final String UPSTREAM_DELETE_RECEIPT="上游删除";
+ public static final String BACK_DELETE_RECEIPT="回传删除";
+ public static final String WMS_DELETE_RECEIPT="WMS删除";
+
+
}