diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java index 7b9cadf..fad9297 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java @@ -22,6 +22,7 @@ import java.util.stream.Collectors; import jnpf.base.model.ColumnDataModel; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.database.model.superQuery.SuperJsonModel; @@ -96,8 +97,16 @@ public class YysMaterialProcurementItemServiceImpl extends ServiceImpl collect = form.getOrderData().stream().map(form1 -> { String mainId = RandomUtil.uuId(); - int index = 1; - String number = String.format("%03d", index); + String number = String.format("%03d", index.getAndIncrement()); YysMaterialProcurementOrderEntity entity = new YysMaterialProcurementOrderEntity(); entity.setOrderDate(DateUtil.getNowDate()); entity.setRequestDeliveryDate(new Date(Long.parseLong(form1.getRequestDeliveryDate()))); @@ -394,7 +388,6 @@ public class YysMaterialProcurementOrderServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + Date todayStart = calendar.getTime(); + calendar.add(Calendar.DAY_OF_MONTH, 1); + calendar.add(Calendar.MILLISECOND, -1); + Date todayEnd = calendar.getTime(); + wrapper.between(YysMaterialProcurementOrderEntity::getOrderDate, todayStart, todayEnd); + wrapper.orderByDesc(YysMaterialProcurementOrderEntity::getOrderNumber).last("limit 0,1"); + YysMaterialProcurementOrderEntity max = this.getOne(wrapper); + if (ObjectUtil.isEmpty(max)) { + return 1; + } + String number = max.getOrderNumber().replace("PO", "").replace(currentDate, ""); + return Integer.parseInt(number) + 1; + } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderForm.java index 9bae81d..5cd46a1 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmaterialprocurementorder/YysMaterialProcurementOrderForm.java @@ -45,7 +45,7 @@ public class YysMaterialProcurementOrderForm { /** * 物料编码 **/ - @JsonProperty("materialID") + @JsonProperty("materialId") private String materialId; /** /**