From d2264d73349d8f0cea3d6bde472548dde227c168 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 07 四月 2025 09:15:38 +0800
Subject: [PATCH] 查询货架条件加上状态
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 0590eea..10324dc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -7,8 +7,6 @@
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -22,16 +20,14 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InformationNotificationService;
-import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
-import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QYWXApi;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,7 +40,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -96,6 +91,8 @@
CustomMapper customMapper;
@Resource
QYWXApi qywxApi;
+ @Autowired
+ ProcessOrder1Mapper processOrderMapper;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -169,7 +166,7 @@
a.setInsOrderId(insOrder.getId());
//鏍峰搧缂栧彿
if (StrUtil.isEmpty(a.getSampleCode())) {
- a.setSampleCode("YP-" + a.getModel() + "-" + giveCode.split("-")[2] + "-" + count.get());
+ a.setSampleCode("YP-" + giveCode.split("-")[2] + "-" + count.get());
}
insSampleMapper.insert(a);
//鏍峰搧鐨勬楠岄」鐩�
@@ -395,6 +392,11 @@
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
insOrder.setSendTime(LocalDateTime.now());
+ /*瀹℃牳閫氳繃杩橀渶瑕佹柊澧炰竴鏉nas瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫*/
+ ProcessOrder processOrder = new ProcessOrder();
+ processOrder.setInsOrderId(insOrder.getId());
+ processOrder.setRule(insOrder.getRule());
+ processOrderMapper.insert(processOrder);
}
return insOrderMapper.updateById(insOrder);
}
--
Gitblit v1.9.3