修复出库历史bug

lector
1 parent ad166d87
Showing 3 changed files with 3 additions and 2 deletions
src/main/java/com/huaheng/pc/shipment/shipmentDetailHistory/controller/ShipmentDetailHistoryController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/domain/ShipmentHeaderHistory.java
@@ -68,6 +68,7 @@ public class ShipmentDetailHistoryController extends BaseController
 		lambdaQueryWrapper
 				.eq(ShipmentDetailHistory::getWarehouseCode,ShiroUtils.getWarehouseCode())
 				.in(ShipmentDetailHistory::getCompanyCode,ShiroUtils.getCompanyCodeList())
+				.eq(StringUtils.isNotEmpty(shipmentDetailHistory.getShipmentId().toString()),ShipmentDetailHistory::getShipmentId,shipmentDetailHistory.getShipmentId())
 				.eq(StringUtils.isNotEmpty(shipmentDetailHistory.getShipmentCode()),ShipmentDetailHistory::getShipmentCode,shipmentDetailHistory.getShipmentCode())
 				.orderByAsc(ShipmentDetailHistory::getId);
  
@@ -166,7 +166,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     public AjaxResult addHistory(ShipmentHeader shipmentHeader) throws InvocationTargetException, IllegalAccessException {
         //单据主单重复
         LambdaQueryWrapper<ShipmentHeaderHistory> headerHistoryLamb = Wrappers.lambdaQuery();
-        headerHistoryLamb.eq(ShipmentHeaderHistory::getCode,shipmentHeader.getCode())
+        headerHistoryLamb.eq(ShipmentHeaderHistory::getId,shipmentHeader.getId())
                         .eq(ShipmentHeaderHistory::getWarehouseCode,shipmentHeader.getWarehouseCode());
  
         ShipmentHeaderHistory headerHistory =shipmentHeaderHistoryService.getOne(headerHistoryLamb);
@@ -19,7 +19,7 @@ public class ShipmentHeaderHistory implements Serializable {
     /**
      * 出库单内部号
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     @ApiModelProperty(value = "出库单内部号")
     private Integer id;