Merge branch 'dev' into dev_WMS20260401

mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/repository/todo/InOrderAbnormalDO.java

@@ -88,4 +88,7 @@ public class InOrderAbnormalDO extends StockInOrderBaseDO {
 
     @ApiModelProperty(name = "权限菜单ID")
     private Long permissionMenuId;
-}
+    @ApiModelProperty("是否需要报关")
+    @Excel(name = "是否需要报关")
+    private Integer needCustomsDeclaration;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java

@@ -249,4 +249,5 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     private Boolean excludeZeroInventoryQuantity;
     private String expiryDateStr;
     private String productionDateStr;
+    private String updateTimeStr;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java

@@ -200,4 +200,7 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("业务单号")
     @Excel(name = "业务单号")
     private String batchNo;
+    @ApiModelProperty("是否需要报关")
+    @Excel(name = "是否需要报关")
+    private Integer needCustomsDeclaration;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java

@@ -23,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -83,6 +86,11 @@ public class MaterialInventoryApi extends BaseController {
         MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
         materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
         materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
+        Date updateTime = materialInventoryDTO.getUpdateTime();
+        LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String dateStr = localDateTime.format(formatter);
+        materialInventoryDO.setUpdateTimeStr(dateStr);
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<MaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);