From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 1f12240..890a547 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -111,24 +111,40 @@
LocalDate localDate3 = staff.getTrialStartDate().toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
LocalDate localDate4 = staff.getTrialEndDate().toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
-
staff.setQyear(localDate2.getYear() + "");
staff.setQmoth(localDate2.getMonthValue() + "");
staff.setQday(localDate2.getDayOfMonth() + "");
+ if(staff.getDateSelect().equals("A")){
+ staff.setSyear(localDate1.getYear() + "");
+ staff.setSmoth(localDate1.getMonthValue() + "");
+ staff.setSday(localDate1.getDayOfMonth() + "");
+ staff.setEyear(localDate.getDayOfMonth() + "");
+ staff.setEmoth(localDate.getDayOfMonth() + "");
+ staff.setEday(localDate.getDayOfMonth() + "");
- staff.setSyear(localDate1.getYear() + "");
- staff.setSmoth(localDate1.getMonthValue() + "");
- staff.setSday(localDate1.getDayOfMonth() + "");
- staff.setEyear(localDate.getDayOfMonth() + "");
- staff.setEmoth(localDate.getDayOfMonth() + "");
- staff.setEday(localDate.getDayOfMonth() + "");
+ staff.setStyear(localDate3.getYear() + "");
+ staff.setStmoth(localDate3.getMonthValue() + "");
+ staff.setStday(localDate3.getDayOfMonth() + "");
+ staff.setSeyear(localDate4.getYear() + "");
+ staff.setSemoth(localDate4.getMonthValue() + "");
+ staff.setSeday(localDate4.getDayOfMonth() + "");
+ }else if (staff.getDateSelect().equals("B")){
- staff.setStyear(localDate3.getYear() + "");
- staff.setStmoth(localDate3.getMonthValue() + "");
- staff.setStday(localDate3.getDayOfMonth() + "");
- staff.setSeyear(localDate4.getYear() + "");
- staff.setSemoth(localDate4.getMonthValue() + "");
- staff.setSeday(localDate4.getDayOfMonth() + "");
+ staff.setBsyear(localDate1.getYear() + "");
+ staff.setBsmoth(localDate1.getMonthValue() + "");
+ staff.setBsday(localDate1.getDayOfMonth() + "");
+
+ staff.setBstyear(localDate3.getYear() + "");
+ staff.setBstmoth(localDate3.getMonthValue() + "");
+ staff.setBstday(localDate3.getDayOfMonth() + "");
+ staff.setBseyear(localDate4.getYear() + "");
+ staff.setBsemoth(localDate4.getMonthValue() + "");
+ staff.setBseday(localDate4.getDayOfMonth() + "");
+ }else if (staff.getDateSelect().equals("C")){
+ staff.setCsyear(localDate1.getYear() + "");
+ staff.setCsmoth(localDate1.getMonthValue() + "");
+ staff.setCsday(localDate1.getDayOfMonth() + "");
+ }
Map<String,Object> data = new HashMap<>();
data.put("item",staff);
--
Gitblit v1.9.3