Переглянути джерело

入库的导入模板(采购入库、其他入库)增加生产日期字段

huang 1 день тому
батько
коміт
7961b519a6

+ 4 - 0
src/main/java/com/jsh/erp/constants/ExceptionConstants.java

@@ -513,6 +513,10 @@ public class ExceptionConstants {
     public static final int DEPOT_ITEM_PRE_BILL_IS_CHANGE_CODE = 9000007;
     public static final String DEPOT_ITEM_PRE_BILL_IS_CHANGE_MSG = "抱歉,原关联单据已被修改,请重新关联";
 
+    //单据明细-明细中生产日期格式错误
+    public static final int DEPOT_ITEM_PRODUCTION_DATE_TIME_CODE = 9000008;
+    public static final String DEPOT_ITEM_PRODUCTION_DATE_TIME_MSG = "抱歉,第%s行生产日期格式错误";
+
     /**
      *  财务信息
      * type = 95

+ 1 - 1
src/main/java/com/jsh/erp/datasource/entities/DepotItem.java

@@ -109,7 +109,7 @@ public class DepotItem {
     private Date createTime;
 
     @ApiModelProperty("生产日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date productionDate;
 
     @ApiModelProperty("保质期天数")

+ 6 - 0
src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -21,6 +21,7 @@ import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
 import com.jsh.erp.query.LambdaQueryWrapperX;
 import com.jsh.erp.service.*;
+import com.jsh.erp.utils.DateUtils;
 import com.jsh.erp.utils.HttpClient;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;
@@ -1626,6 +1627,7 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                     String remark = detailMap.get("remark");
                     item.put("operNumber", operNumber);
                     item.put("unitPrice", unitPrice);
+                    item.put("productionDate",detailMap.get("productionDate"));
                     BigDecimal allPrice = BigDecimal.ZERO;
                     if(unitPrice!=null && unitPrice.compareTo(BigDecimal.ZERO)!=0) {
                         allPrice = unitPrice.multiply(operNumber);
@@ -1640,6 +1642,10 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                     item.put("taxMoney", taxMoney);
                     item.put("taxLastMoney", taxLastMoney);
                     item.put("remark", remark);
+                    item.put("expiryNum",m.getExpiryNum());
+                    item.put("wholesaleDecimal",m.getDefaultWholesaleDecimal());
+                    item.put("defaultPurchaseDecimal",m.getDefaultPurchaseDecimal());
+                    item.put("defaultWholesaleDecimal",m.getDefaultWholesaleDecimal());
                     arr.add(item);
                 } else {
                     throw new BusinessRunTimeException(ExceptionConstants.DEPOT_ITEM_BARCODE_IS_NOT_EXIST_CODE,

+ 14 - 0
src/main/java/com/jsh/erp/utils/DateUtils.java

@@ -7,6 +7,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.*;
 
 /**
@@ -319,4 +320,17 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         }
         return dates;
     }
+
+    /**
+     * 校验字符日期格式是否正确
+     */
+    public static boolean isDateValid(String inputDate, String format) {
+        try {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+            LocalDate.parse(inputDate, formatter);
+        } catch (DateTimeParseException e) {
+            return false;
+        }
+        return true;
+    }
 }