diff --git a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
index ba992cc..4e8ae9a 100644
--- a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
@@ -159,7 +159,7 @@ public class ShipmentApiService {
shipmentDetail.setAllCreditCode(customer.getAllCreditCode());
}
shipmentDetail.setSaleArea(saleArea);
- shipmentDetail.setFentity(shipmentDetail.getFentity());
+ shipmentDetail.setFentity(shipmentDetail.getReferId()+"");//体制码
shipmentDetail.setInventorySts(QuantityConstant.GOOD);
shipmentDetail.setShipmentId(shipmentHeader.getId());
shipmentDetail.setShipQty(shipmentDetail.getUnitId1Qty());
diff --git a/src/main/resources/templates/shipment/shipmentDetail/edit.html b/src/main/resources/templates/shipment/shipmentDetail/edit.html
index 3f7241c..3e62260 100644
--- a/src/main/resources/templates/shipment/shipmentDetail/edit.html
+++ b/src/main/resources/templates/shipment/shipmentDetail/edit.html
@@ -130,12 +130,12 @@
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">梯次包编码：</label>
- <div class="col-sm-8">
- <input id="echelonPacketCode" name="echelonPacketCode" th:field="*{echelonPacketCode}" class="form-control" type="text">
- </div>
- </div>
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">梯次包编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="echelonPacketCode" name="echelonPacketCode" th:field="*{echelonPacketCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group" th:if="${isBattery}">
<label class="col-sm-3 control-label">梯次应用领域：</label>
<div class="col-sm-8">
@@ -154,24 +154,24 @@
</select>
</div>
</div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">其他内容：</label>
- <div class="col-sm-8">
- <input id="otherContent" name="otherContent" th:field="*{otherContent}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">梯次包去向企业名称 ：</label>
- <div class="col-sm-8">
- <input id="echelonEnterpriseName" name="otherContent" th:field="*{echelonEnterpriseName}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">梯次包去向企业信用代码：</label>
- <div class="col-sm-8">
- <input id="echelonEnterpriseCode" name="otherContent" th:field="*{echelonEnterpriseCode}" class="form-control" type="text">
- </div>
- </div>
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">其他内容：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="otherContent" name="otherContent" th:field="*{otherContent}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">梯次包去向企业名称 ：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="echelonEnterpriseName" name="otherContent" th:field="*{echelonEnterpriseName}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">梯次包去向企业信用代码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="echelonEnterpriseCode" name="otherContent" th:field="*{echelonEnterpriseCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group" th:if="${isBattery}">
<label class="col-sm-3 control-label">构成方式：</label>
<div class="col-sm-8">
@@ -181,30 +181,30 @@
</select>
</div>
</div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">去向个人姓名：</label>
- <div class="col-sm-8">
- <input id="customerName" name="customerName" th:field="*{customerName}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">去向个人身份证：</label>
- <div class="col-sm-8">
- <input id="customerIDNumber" name="customerIDNumber" th:field="*{customerIDNumber}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">梯次模块编码：</label>
- <div class="col-sm-8">
- <input id="echelonModuleCode" name="echelonModuleCode" th:field="*{echelonModuleCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">梯次单体编码：</label>
- <div class="col-sm-8">
- <input id="echelonMonomerCode" name="echelonMonomerCode" th:field="*{echelonMonomerCode}" class="form-control" type="text">
- </div>
- </div>
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">去向个人姓名：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="customerName" name="customerName" th:field="*{customerName}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">去向个人身份证：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="customerIDNumber" name="customerIDNumber" th:field="*{customerIDNumber}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">梯次模块编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="echelonModuleCode" name="echelonModuleCode" th:field="*{echelonModuleCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">梯次单体编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="echelonMonomerCode" name="echelonMonomerCode" th:field="*{echelonMonomerCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group" th:if="${isBattery}">
<label class="col-sm-3 control-label">电池产品类型：</label>
<div class="col-sm-8">
@@ -218,132 +218,126 @@
</select>
</div>
</div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">电池编码：</label>
- <div class="col-sm-8">
- <input id="batteryCode" name="batteryCode" th:field="*{batteryCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">国家编码：</label>
- <div class="col-sm-8">
- <input id="countryCode" name="countryCode" th:field="*{countryCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">出库时间：</label>
- <div class="col-sm-8">
- <input id="shipmentDate" name="shipmentDate" th:field="*{shipmentDate}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">电池去向企业名称：</label>
- <div class="col-sm-8">
- <input id="enterpriseName" name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
- </div>
- </div>
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">电池编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="batteryCode" name="batteryCode" th:field="*{batteryCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">国家编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="countryCode" name="countryCode" th:field="*{countryCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">出库时间：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="shipmentDate" name="shipmentDate" th:field="*{shipmentDate}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">电池去向企业名称：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="enterpriseName" name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<!--<div class="form-group" th:if="${isBattery}">
<label class="col-sm-3 control-label">电池去向企业统一社会信用代码：</label>
<div class="col-sm-8">
<input id="allCreditCode" name="allCreditCode" th:field="*{allCreditCode}" class="form-control" type="text">
</div>
</div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">出库质量(kg)：</label>
- <div class="col-sm-8">
- <input id="shipQuality" name="shipQuality" th:field="*{shipQuality}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">再生日期：</label>
- <div class="col-sm-8">
- <input id="regenerateDate" name="regenerateDate" th:field="*{regenerateDate}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">处理质量：</label>
- <div class="col-sm-8">
- <input id="treatmentQuality" name="treatmentQuality" th:field="*{treatmentQuality}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">废弃物去向：</label>
- <div class="col-sm-8">
- <input id="wasteDestination" name="wasteDestination" th:field="*{wasteDestination}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">电池个数：</label>
- <div class="col-sm-8">
- <input id="batteryQty" name="batteryQty" th:field="*{batteryQty}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">电池电量：</label>
- <div class="col-sm-8">
- <input id="electricQuantity" name="electricQuantity" th:field="*{electricQuantity}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">电池包编码：</label>
- <div class="col-sm-8">
- <input id="batteryPageCode" name="batteryPageCode" th:field="*{batteryPageCode}" class="form-control" type="text">
- </div>
- </div>
-
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">再生物质名称：</label>
- <div class="col-sm-8">
- <input id="regenerateSubstanceName" name="regenerateSubstanceName" th:field="*{regenerateSubstanceName}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">再生利用率：</label>
- <div class="col-sm-8">
- <input id="regenerateUtilizationRate" name="regenerateUtilizationRate" th:field="*{regenerateUtilizationRate}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group" th:if="${isBattery}">
- <label class="col-sm-3 control-label">物质再生质量：</label>
- <div class="col-sm-8">
- <input id="substanceRegenerateQuality" name="substanceRegenerateQuality" th:field="*{substanceRegenerateQuality}" class="form-control" type="text">
- </div>
- </div>
-
-
-
-
-
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">出库质量(kg)：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="shipQuality" name="shipQuality" th:field="*{shipQuality}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">再生日期：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="regenerateDate" name="regenerateDate" th:field="*{regenerateDate}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">处理质量：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="treatmentQuality" name="treatmentQuality" th:field="*{treatmentQuality}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">废弃物去向：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="wasteDestination" name="wasteDestination" th:field="*{wasteDestination}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">电池个数：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="batteryQty" name="batteryQty" th:field="*{batteryQty}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">电池电量：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="electricQuantity" name="electricQuantity" th:field="*{electricQuantity}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">电池包编码：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="batteryPageCode" name="batteryPageCode" th:field="*{batteryPageCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">再生物质名称：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="regenerateSubstanceName" name="regenerateSubstanceName" th:field="*{regenerateSubstanceName}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">再生利用率：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="regenerateUtilizationRate" name="regenerateUtilizationRate" th:field="*{regenerateUtilizationRate}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group" th:if="${isBattery}">-->
+<!-- <label class="col-sm-3 control-label">物质再生质量：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="substanceRegenerateQuality" name="substanceRegenerateQuality" th:field="*{substanceRegenerateQuality}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group">
<div class="col-sm-8">
<input id="status" name="status" th:field="*{status}" class="form-control" type="hidden" >
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建时间：</label>
- <div class="col-sm-8">
- <input id="created" name="created" th:field="*{created}" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建用户：</label>
- <div class="col-sm-8">
- <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">最后修改时间：</label>
- <div class="col-sm-8">
- <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">更新用户：</label>
- <div class="col-sm-8">
- <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">创建时间：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="created" name="created" th:field="*{created}" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">创建用户：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">最后修改时间：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">更新用户：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
<!--<div class="col-sm-8">-->