diff --git a/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
index 8a4f73b..59e5ef3 100644
--- a/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
@@ -164,7 +164,7 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
if (material == null) {
return AjaxResult.error("物料不存在：" + materialCode);
}
- if (material.getSpec().equals("自建单据物料")) {
+ if (material.getSelfCreated()) {
isSelfCreated = 1;
}
}
diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
index edae05f..efa3d17 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
@@ -233,7 +233,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService
if (material == null) {
return AjaxResult.error("物料不存在：" + materialCode);
}
- if (material.getSpec().equals("自建单据物料")) {
+ if (material.getSelfCreated()) {
isSelfCreated = 1;
break;
}
diff --git a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
index edc132a..4bb080a 100644
--- a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
+++ b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
@@ -18,6 +18,7 @@ import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.common.JasperPrint.Print;
+import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
import com.huaheng.pc.config.materialArea.domain.MaterialArea;
@@ -93,6 +94,8 @@ public class MaterialController extends BaseController {
.eq(StringUtils.isNotEmpty(material.getType()), Material::getType, material.getType())
.like(StringUtils.isNotNull(material.getSpec()) && StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec())
.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(material.getSelfCreated() != null, Material::getSelfCreated, material.getSelfCreated())
+
.eq(Material::getDeleted, false);
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
index a637cfa..65e3a57 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -19,6 +19,7 @@ import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.framework.web.service.ConfigService;
import com.huaheng.pc.config.company.domain.Company;
import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialServiceImpl;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
@@ -113,6 +114,7 @@ public class InventoryDetailController extends BaseController {
.like(StringUtils.isNotEmpty(inventoryDetail.getMaterialColor()), InventoryDetail::getMaterialColor, inventoryDetail.getMaterialColor()) //原仓库编码
.eq(StringUtils.isNotEmpty(inventoryDetail.getWarehouse()), InventoryDetail::getWarehouse, inventoryDetail.getWarehouse()) //原仓库编码
.like(StringUtils.isNotEmpty(inventoryDetail.getWarehouseName()), InventoryDetail::getWarehouseName, inventoryDetail.getWarehouseName()) //原仓库名称
+ .eq(inventoryDetail.getSelfCreated() != null, InventoryDetail::getSelfCreated, inventoryDetail.getSelfCreated())
//货主
.in(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()), InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode())
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
index 1ba4ff4..81c3abe 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
@@ -365,4 +365,10 @@ public class InventoryDetail implements Serializable {
@TableField(value = "isMustFlatWarehouseMaterial")
@ApiModelProperty(value = "是否必须平库物料，1为是")
private Boolean isMustFlatWarehouseMaterial;
+
+ /**
+ * 1为自建单据
+ */
+ @TableField(value = "selfCreated")
+ private Boolean selfCreated;
}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
index 129d696..cf1d557 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
@@ -12,6 +12,7 @@ import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
@@ -89,6 +90,8 @@ public class InventoryTransactionController extends BaseController {
.eq(StringUtils.isNotEmpty(inventoryTransaction.getWarehouse()), InventoryTransaction::getWarehouse, inventoryTransaction.getWarehouse()) //原仓库编码
.like(StringUtils.isNotEmpty(inventoryTransaction.getWarehouseName()), InventoryTransaction::getWarehouseName, inventoryTransaction.getWarehouseName()) //原仓库名称
.eq(StringUtils.isNotEmpty(inventoryTransaction.getZoneCode()), InventoryTransaction::getZoneCode, inventoryTransaction.getZoneCode()) //库区
+ .eq(inventoryTransaction.getSelfCreated() != null, InventoryTransaction::getSelfCreated, inventoryTransaction.getSelfCreated())
+
//货主
.in(InventoryTransaction::getCompanyCode, ShiroUtils.getCompanyCodeList())
.orderByDesc(InventoryTransaction::getId);
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
index 0a81f73..78a5137 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
@@ -358,4 +358,10 @@ public class InventoryTransaction implements Serializable {
@TableField(value = "isMustFlatWarehouseMaterial")
@ApiModelProperty(value = "是否必须平库物料，1为是")
private Boolean isMustFlatWarehouseMaterial;
+
+ /**
+ * 1为自建单据
+ */
+ @TableField(value = "selfCreated")
+ private Boolean selfCreated;
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
index dac8e6e..625fe98 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
@@ -422,4 +422,10 @@ public class ReceiptDetail implements Serializable {
@TableField(value = "remarks")
@ApiModelProperty(value = "自建库备注")
private String remarks;
+
+ /**
+ * 1为自建单据
+ */
+ @TableField(value = "selfCreated")
+ private Boolean selfCreated;
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
index 4b112d4..8f78d30 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -120,6 +120,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
receiptDetail.setMaterialName(material.getName());
receiptDetail.setMaterialSpec(material.getSpec());
receiptDetail.setMaterialUnit(material.getUnit());
+ receiptDetail.setSelfCreated(true);
receiptDetail.setCreatedBy(ShiroUtils.getName());
receiptDetail.setLastUpdatedBy(ShiroUtils.getName());
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java b/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java
index 50280fc..68b5b59 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java
@@ -14,6 +14,7 @@ import lombok.Data;
@Data
@TableName(value = "receipt_detail_history")
public class ReceiptDetailHistory implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 入库明细内部号
*/
@@ -424,5 +425,17 @@ public class ReceiptDetailHistory implements Serializable {
@ApiModelProperty(value = "是否平库，1为平库")
private Integer isFlatWarehouse;
- private static final long serialVersionUID = 1L;
+ @TableField(value = "isMustFlatWarehouseMaterial")
+ @ApiModelProperty(value = "是否必须平库物料，1为是")
+ private Boolean isMustFlatWarehouseMaterial;
+
+ @TableField(value = "remarks")
+ @ApiModelProperty(value = "自建库备注")
+ private String remarks;
+
+ /**
+ * 1为自建单据
+ */
+ @TableField(value = "selfCreated")
+ private Boolean selfCreated;
}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index 04b953a..6a19d41 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -201,6 +201,8 @@ public class ShipmentHeaderController extends BaseController {
.like(StringUtils.isNotEmpty(shipmentHeader.getProcessType()), ShipmentHeader::getProcessType, shipmentHeader.getProcessType())
.eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()), ShipmentHeader::getShipmentType, shipmentHeader.getShipmentType())
.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
+ .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorCode()), ShipmentHeader::getSuperiorCode, shipmentHeader.getSuperiorCode())
+ .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorName()), ShipmentHeader::getSuperiorName, shipmentHeader.getSuperiorName())
.like(StringUtils.isNotEmpty(shipmentHeader.getTransferWarehouseName()), ShipmentHeader::getTransferWarehouseName, shipmentHeader.getTransferWarehouseName())
.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
.between(StringUtils.isNotNull(startTime1), ShipmentHeader::getRequestedDeliveryDate, startTime1, endTime1)
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
index 6fc4b9e..2ce5c9f 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
@@ -152,6 +152,8 @@ public class ShipmentHeaderHistoryController extends BaseController {
.like(StringUtils.isNotEmpty(shipmentHeader.getProcessType()), ShipmentHeaderHistory::getProcessType, shipmentHeader.getProcessType())
.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeaderHistory::getReferCode, shipmentHeader.getReferCode())
.like(StringUtils.isNotEmpty(shipmentHeader.getTransferWarehouseName()), ShipmentHeaderHistory::getTransferWarehouseName, shipmentHeader.getTransferWarehouseName())
+ .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorCode()), ShipmentHeaderHistory::getSuperiorCode, shipmentHeader.getSuperiorCode())
+ .like(StringUtils.isNotEmpty(shipmentHeader.getSuperiorName()), ShipmentHeaderHistory::getSuperiorName, shipmentHeader.getSuperiorName())
.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeaderHistory::getReferCodeType, shipmentHeader.getReferCodeType())
.like(StringUtils.isNotEmpty(shipmentHeader.getOrigin()), ShipmentHeaderHistory::getOrigin, shipmentHeader.getOrigin())
.between(StringUtils.isNotNull(startTime1), ShipmentHeaderHistory::getRequestedDeliveryDate, startTime1, endTime1)
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
index 45011e4..5a5efc1 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -560,7 +560,9 @@ public class ReceiptTaskService {
inventoryDetail.setIsFlatWarehouse(receiptDetail.getIsFlatWarehouse());
inventoryDetail.setRemarks(receiptDetail.getRemarks());
inventoryDetail.setIsMustFlatWarehouseMaterial(receiptDetail.getIsMustFlatWarehouseMaterial());
-
+ if (receiptDetail.getSelfCreated()) {
+ inventoryDetail.setSelfCreated(true);
+ }
inventoryDetail.setReceiptCode(receiptHeader.getCode());
inventoryDetail.setMaterialColor(receiptHeader.getMaterialColor());
inventoryDetail.setWarehouse(receiptHeader.getWarehouse());
@@ -604,6 +606,9 @@ public class ReceiptTaskService {
inventoryTransaction.setWarehouseName(receiptHeader.getWarehouseName());
inventoryTransaction.setIsFlatWarehouse(receiptDetail.getIsFlatWarehouse());
inventoryTransaction.setIsMustFlatWarehouseMaterial(receiptDetail.getIsMustFlatWarehouseMaterial());
+ if (receiptDetail.getSelfCreated()) {
+ inventoryDetail.setSelfCreated(true);
+ }
TaskHeader taskHeader = taskHeaderService.getById(taskDetail.getTaskId());
if (StringUtils.isNotEmpty(taskHeader.getLastUpdatedBy())) {
inventoryTransaction.setCreatedBy(taskHeader.getLastUpdatedBy());
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
index a1538c2..a8751cc 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -509,7 +509,7 @@ public class ShipmentTaskService {
List<InventoryDetail> list = inventoryDetailService.list(new LambdaUpdateWrapper<InventoryDetail>().eq(InventoryDetail::getMaterialCode, materialCode));
if (list.isEmpty()) {
Material material = materialService.getMaterialByCode(materialCode, "CS0001");
- if (material != null) {
+ if (material != null && material.getSelfCreated()) {
materialService.removeById(material);
}
}
diff --git a/src/main/resources/templates/config/material/material.html b/src/main/resources/templates/config/material/material.html
index fad2107..d87614a 100644
--- a/src/main/resources/templates/config/material/material.html
+++ b/src/main/resources/templates/config/material/material.html
@@ -18,10 +18,18 @@
<li>
规格：<input type="text" name="spec"/>
</li>
+
+ <!-- <li>-->
+ <!-- 物料类别：<select name="type" th:with="type=${@materialType.list()}">-->
+ <!-- <option value="">所有</option>-->
+ <!-- <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option>-->
+ <!-- </select>-->
+ <!-- </li>-->
<li>
- 物料类别：<select name="type" th:with="type=${@materialType.list()}">
- <option value="">所有</option>
- <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option>
+ 是否自建单据物料：<select id="selfCreated" name="selfCreated">
+ <option value=''>所有</option>
+ <option value="true">是</option>
+ <option value="false">否</option>
</select>
</li>
<li class="time2">
@@ -79,6 +87,7 @@
var datas = [[${@dict.getType('sys_normal_disable')}]];
var mType = [[${@materialType.queryType()}]];
var materialArea = [[${@materialArea.queryCode()}]];
+ var selfCreatedList = [[${@dict.getType('yes_or_no')}]];
$(function () {
var options = {
@@ -175,6 +184,14 @@
title: '供需政策'
},
{
+ field: 'selfCreated',
+ title: '自建单据物料',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(selfCreatedList, value);
+ },
+ align: 'center',
+ },
+ {
field: 'isBatch',
title: '是否批次'
},
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index 274c186..22383fa 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -49,6 +49,12 @@
原仓库编码：<input type="text" name="warehouseName"/>
</li>
<li>
+ 是否自建单据：<select id="selfCreated" name="selfCreated">
+ <option value=''>所有</option>
+ <option value="true">是</option>
+ <option value="false">否</option>
+ </select>
+ <li>
库存状态：
<select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
<option value="">所有</option>
@@ -333,6 +339,14 @@
title: '通知单号',
},
{
+ field: 'selfCreated',
+ title: '自建单据',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(yes_or_no, value);
+ },
+ align: 'center',
+ },
+ {
field: 'remarks',
title: '备注',
},
diff --git a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
index c0e72a4..431cfe9 100644
--- a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
+++ b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
@@ -74,9 +74,15 @@
<li>
合并前单号：<input type="text" name="recordCode"/>
</li>
- <!-- <li>-->
- <!-- 操作人工号：<input type="text" name="createdByNo"/>-->
- <!-- </li>-->
+ <li>
+ 是否自建单据：<select id="selfCreated" name="selfCreated">
+ <option value=''>所有</option>
+ <option value="true">是</option>
+ <option value="false">否</option>
+ </select>
+ <!-- <li>-->
+ <!-- 操作人工号：<input type="text" name="createdByNo"/>-->
+ <!-- </li>-->
<li class="time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
@@ -240,6 +246,14 @@
title: '任务数量'
},
{
+ field: 'selfCreated',
+ title: '自建单据',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(yes_or_no, value);
+ },
+ align: 'center',
+ },
+ {
field: 'batch',
title: '批次',
visible: false
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index 1e5c2fe..cf306b4 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -304,6 +304,7 @@
var statusFirst = [[${statusFirst}]];
var statusLast = [[${statusLast}]];
var yes_or_no = [[${@dict.getType('yes_or_no')}]];
+
//完成开始
layui.use('laydate', function () {
var laydate = layui.laydate;
@@ -711,6 +712,14 @@
title: '已收数量'
},
{
+ field: 'selfCreated',
+ title: '自建单据物料',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(yes_or_no, value);
+ },
+ align: 'center',
+ },
+ {
field: 'isMustFlatWarehouseMaterial',
title: '必须平库物料',
formatter: function (value, row, index) {
@@ -731,6 +740,7 @@
}
}
},
+
{
field: 'referCode',
title: 'ERP单号',
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index c0e1306..4a0ef3b 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -76,6 +76,12 @@
调入仓库名称：<input type="text" name="transferWarehouseName"/>
</li>
<li>
+ 母件名称：<input type="text" name="superiorName"/>
+ </li>
+ <li>
+ 母件编码：<input type="text" name="superiorCode"/>
+ </li>
+ <li>
头 状 态：<select name="firstStatus"
th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
<option value="">所有</option>
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
index 3aa615e..5e445ba 100644
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
+++ b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -62,6 +62,12 @@
调入仓库名称：<input type="text" name="transferWarehouseName"/>
</li>
<li>
+ 母件名称：<input type="text" name="superiorName"/>
+ </li>
+ <li>
+ 母件编码：<input type="text" name="superiorCode"/>
+ </li>
+ <li>
头 状 态：<select name="firstStatus"
th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
<option value="">所有</option>