From 53cc4a78b5cfa522ee70b58909203f83b560cfc3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 22 Mar 2024 11:32:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?2024-3-22=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?-=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=88=AB=E9=80=89=E6=8B=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/op/wms/controller/BaseEquipmentController.java | 9 +++++++++
.../main/java/com/op/wms/mapper/BaseEquipmentMapper.java | 3 +++
.../java/com/op/wms/service/IBaseEquipmentService.java | 2 ++
.../op/wms/service/impl/BaseEquipmentServiceImpl.java | 9 +++++++++
.../main/resources/mapper/wms/BaseEquipmentMapper.xml | 9 +++++++++
5 files changed, 32 insertions(+)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
index b15c51b8..e39cbc74 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
@@ -277,4 +277,13 @@ public class BaseEquipmentController extends BaseController {
List<BaseEquipment> list = baseEquipmentService.selectBYRecordsList(baseEquipment);
return getDataTable(list);
}
+
+ /**
+ * 查询设备类型(字典中的)
+ */
+ @GetMapping("/getEquipmentTypeDeptList")
+ public TableDataInfo getEquipmentTypeDeptList(BaseEquipment baseEquipment) {
+ List<BaseEquipment> list = baseEquipmentService.getEquipmentTypeDeptList(baseEquipment);
+ return getDataTable(list);
+ }
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
index 05753314..4c1aae93 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
@@ -135,4 +135,7 @@ public interface BaseEquipmentMapper {
//查询辅助设备
List<BaseEquipment> selectEquipmentListByCategory(BaseEquipment baseEquipment);
+
+ //查询设备类型（维护在字典中的）
+ List<BaseEquipment> getEquipmentTypeDeptList(BaseEquipment baseEquipment);
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
index d4ed29d5..fec24879 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
@@ -93,4 +93,6 @@ public interface IBaseEquipmentService {
//辅助设备列表
List<BaseEquipment> selectEquipmentListByCategory(BaseEquipment baseEquipment);
+
+ List<BaseEquipment> getEquipmentTypeDeptList(BaseEquipment baseEquipment);
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
index 330a7668..6204554c 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
@@ -616,4 +616,13 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
public List<BaseEquipment> selectBYRecordsList(BaseEquipment baseEquipment) {
return baseEquipmentMapper.selectBYRecordsList(baseEquipment);
}
+
+ /**
+ * 查询设备类型
+ */
+ @Override
+ @DS("master")
+ public List<BaseEquipment> getEquipmentTypeDeptList(BaseEquipment baseEquipment) {
+ return baseEquipmentMapper.getEquipmentTypeDeptList(baseEquipment);
+ }
}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index cf87e858..73f685fc 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -710,4 +710,13 @@
and plan_type = 'maintenance'
</select>
+ <select id="getEquipmentTypeDeptList" parameterType="BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
+ select
+ dict_label as equipmentTypeName,
+ dict_value as equipmentTypeCode
+ from sys_dict_data
+ where dict_type = 'equ_type'
+ and status ='0'
+ </select>
+
</mapper>
From 29c2ca8448a8a03762985767f6461c9e277fbbb8 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 22 Mar 2024 12:22:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=A5=E5=B7=A5+=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D+=E5=85=B6=E5=AE=83?=
=?UTF-8?q?=E7=BB=86=E8=8A=82=E5=8A=9F=E8=83=BD=E6=94=B9=E5=96=842?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/op/job/task/RyTask.java | 15 +++++-----
.../java/com/op/open/mapper/OpenMapper.java | 2 ++
.../op/open/service/impl/OpenServiceImpl.java | 29 ++++++++++++-------
.../main/resources/mapper/open/OpenMapper.xml | 6 ++++
.../plan/controller/ProOrderController.java | 1 -
.../plan/mapper/ProOrderWorkorderMapper.java | 4 +++
.../service/impl/ProOrderServiceImpl.java | 24 +++++++++++++--
.../mapper/plan/ProOrderWorkorderMapper.xml | 22 +++++++++++++-
.../impl/QcCheckTaskIncomeServiceImpl.java | 15 ++++------
.../impl/QcCheckTaskProduceServiceImpl.java | 20 +++++++------
10 files changed, 96 insertions(+), 42 deletions(-)
diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
index fb387861..394e2fbc 100644
--- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
+++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java
@@ -157,9 +157,15 @@ public class RyTask {
/************质量管理系统定时任务开始*****************/
//过程巡检，每3分钟执行检查一次
public void createProduceXJTask(){
- logger.info("++质量管理系统+过程巡检+开始++createProduceXJTask+++++");
+ logger.info("++质量管理系统+过程巡检任务创建+开始++createProduceXJTask+++++");
remoteQualityService.createProduceXJTask();
}
+
+ //来料检验批量检验任务创建，每30分钟执行一次
+ public void createIncomeBatchTask(){
+ logger.info("++质量管理系统+来料检验任务创建+开始++createIncomeBatchTask+++++");
+ remoteQualityService.createIncomeBatchTask();
+ }
/************质量管理系统定时任务结束*****************/
/************hr 人力基础数据定时任务开始*****************/
@@ -182,12 +188,5 @@ public class RyTask {
}
/************部门基础数据定时任务开始*****************/
- /************质量管理系统-来料检验批量检验任务创建-定时任务开始*****************/
- //来料检验批量检验任务创建，每30分钟执行一次
- public void createIncomeBatchTask(){
- logger.info("++质量管理系统+来料检验批量检验任务创建+开始++createIncomeBatchTask+++++");
- remoteQualityService.createIncomeBatchTask();
- }
- /************质量管理系统-来料检验批量检验任务创建-定时任务结束*****************/
}
diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
index 85ccc6cf..3bd8ad5f 100644
--- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
+++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java
@@ -80,5 +80,7 @@ public interface OpenMapper {
List<QcUserMaterialDTO> getCheckUsers(String checkType);
public int addCheckUsers(@Param("list") List<QcUserMaterialDTO> users);
+
+ String getSampNum(QcCheckTaskProduceDTO sampQua);
}
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index da094dcb..52b75d54 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -372,24 +372,33 @@ public class OpenServiceImpl implements OpenService {
int m = openMapper.addCheckUsers(users);
logger.info(qcCheckTaskProduce.getOrderNo()+":检查人新增" + m + "成功");
- /**qc_check_type_project**/
+ /**qc_check_type_project**///个性
List<QcCheckTaskDetailDTO> items = openMapper.getTPByTypeMaterial(qctp);
- if (CollectionUtils.isEmpty(items)) {
- /**qc_material_group_detail**/
- QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
- if (group == null) {
- logger.info(qcCheckTaskProduce.getOrderNo()+":"+qcCheckTaskProduce.getMaterialCode()+"没有维护物料组检测项，检验任务生成失败");
- return 0;//没有找到检测项目
- }
- qctp.setGroupId(group.getGroupId());//共性
- items = openMapper.getTPByTypeGroup(qctp);
+
+ /**qc_material_group_detail**/
+ QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
+ if (group == null) {
+ group = new QcMaterialGroupDetailDTO();
+ group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");
}
+ qctp.setGroupId(group.getGroupId());//共性
+ List<QcCheckTaskDetailDTO> itemsGG = openMapper.getTPByTypeGroup(qctp);
+ items.addAll(itemsGG);
/**qc_check_task_detail**/
if (CollectionUtils.isEmpty(items)) {
return 0;//没有找到检测项目
}
+ /**qc_sample_rule**/
+ QcCheckTaskProduceDTO sampQua = new QcCheckTaskProduceDTO();
+ sampQua.setCheckType(qcCheckTaskProduce.getCheckType());
+ sampQua.setQuality(qcCheckTaskProduce.getQuality());
+ String sampNum = openMapper.getSampNum(sampQua);
+ if(StringUtils.isNotBlank(sampNum)){
+ qcCheckTaskProduce.setSampleQuality(new BigDecimal(sampNum));
+ }
+
/**qc_check_task**/
qcCheckTaskProduce.setRecordId(beLongId);
qcCheckTaskProduce.setFactoryCode(factoryCode);
diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
index 6e780f62..aa7436fe 100644
--- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
+++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
@@ -201,6 +201,12 @@
from qc_user_material qum
where qum.material_code = #{checkType} and pow.del_flag = '0' and qum.del_flag = '0'
</select>
+ <select id="getSampNum" resultType="java.lang.String">
+ select sample_quality
+ from qc_sample_rule
+ where end_value>= #{quality} and #{quality}>=start_value and del_flag = '0'
+ and check_type = #{checkType}
+ </select>
<insert id="insertEquRepairOrder" parameterType="DeviceRepairOrder">
insert into equ_repair_order
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java
index f3915d6f..08a18768 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java
@@ -292,7 +292,6 @@ public class ProOrderController extends BaseController {
return proOrderService.syncSAPOrders();
}
/**
- * 下发生产工单。workorderIds：母工单号
* 如果改成复选，需要考虑很多中订单组合情况
* 所以尽量不要动
*/
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index b9e518f0..72fc7853 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -197,5 +197,9 @@ public interface ProOrderWorkorderMapper {
List<ProOrderWorkorder> getOrderByOrders(@Param("orderIds") String[] orderIds);
List<String> checkBatchCodes(@Param("batchs") List<Batch> formFields);
+
+ List<ProOrderWorkorder> getUnSplitOrder(@Param("orderIds") String[] orderIds);
+
+ ProOrderWorkorder selectSonOrder(String parentOrder);
}
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index 5ae7f845..c76adc38 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -1094,10 +1094,27 @@ public class ProOrderServiceImpl implements IProOrderService {
@Transactional(rollbackFor = Exception.class)
public int deleteOrder(String[] orderIds) {
- //未拆分，直接关闭订单
+ //未拆分、部分拆分，直接关闭订单
List<ProOrderWorkorder> checkOrders = proOrderWorkorderMapper.getOrderByOrders(orderIds);
if(!CollectionUtils.isEmpty(checkOrders)){
- int m0 = proOrderMapper.deleteProOrderByIds(orderIds);
+ List<String> allOrderIds = new ArrayList<>();
+ for(ProOrderWorkorder order:checkOrders){
+ String topOrderCode = order.getOrderCode();
+ allOrderIds.add(order.getOrderId());
+ Boolean run = true;
+ while (run) {
+ //下级
+ ProOrderWorkorder sonOrder = proOrderWorkorderMapper.selectSonOrder(topOrderCode);
+ //有下级code
+ if (sonOrder != null) {
+ allOrderIds.add(sonOrder.getOrderId());
+ topOrderCode = sonOrder.getOrderCode();
+ } else {
+ run = false;
+ }
+ }
+ }
+ int m0 = proOrderMapper.deleteProOrderByIds(allOrderIds.toArray(new String[allOrderIds.size()]));
logger.info(orderIds[0]+"删除订单m0:"+m0);
return 1;
}
@@ -1107,6 +1124,7 @@ public class ProOrderServiceImpl implements IProOrderService {
if(checkWorkOrders.size() != orderIds.length){
return 2;
}
+
for(ProOrderWorkorder workorder:checkWorkOrders){
//要删除的工单id们
List<String> delteIds = new ArrayList<>();
@@ -1178,7 +1196,7 @@ public class ProOrderServiceImpl implements IProOrderService {
if(!CollectionUtils.isEmpty(repeatBatchCodes)){
return StringUtils.join(repeatBatchCodes, ",");
}
- return "";
+ return "";
}
public static void main(String args[]){
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 583eb34c..8fdca2a1 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -535,7 +535,7 @@
and pow.del_flag = '0'
</select>
<select id="getOrderByOrders" resultType="com.op.plan.domain.ProOrderWorkorder">
- select status,id
+ select status,id orderId,order_code orderCode
from pro_order
where id in
<foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
@@ -551,6 +551,26 @@
#{batch.batchCode}
</foreach>
</select>
+ <select id="getUnSplitOrder" resultType="com.op.plan.domain.ProOrderWorkorder">
+ select
+ order_code orderCode,
+ id orderId
+ from pro_order po
+ where po.id in
+ <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
+ #{orderId}
+ </foreach>
+ and po.status in ('o0')
+ and po.del_flag = '0'
+ </select>
+ <select id="selectSonOrder" resultType="com.op.plan.domain.ProOrderWorkorder">
+ select order_code orderCode,
+ id orderId,
+ parent_order parentOrder
+ from pro_order po
+ where po.parent_order = #{parentOrder}
+ and po.del_flag = '0'
+ </select>
<insert id="createPrepareDetails">
insert into mes_prepare_detail
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 9ac1a3f5..e88e9018 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -150,22 +150,17 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
QcCheckTypeProject qctp= new QcCheckTypeProject();
qctp.setTypeId(qcCheckTaskIncome.getCheckType());//生产过程检验
qctp.setMaterialCode(qcCheckTaskIncome.getMaterialCode());//特性
- /**qc_check_type_project**/
+ /**qc_check_type_project**///个性
List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
-
/**qc_material_group_detail**/
- //个性
QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskIncome.getMaterialCode());
-// if(group == null){
-// return 0;//没有找到检测项目
-// }
- if(Objects.isNull(group)){
- return 0;//没有找到检测项目
- }
//共性
+ if(group == null){//默认
+ group = new QcMaterialGroupDetail();
+ group.setGroupId("729971295b734782b544f9d6d06fb8b9");
+ }
qctp.setGroupId(group.getGroupId());
List<QcCheckTaskDetail> itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
-
items.addAll(itemsGG);
/**qc_check_task_detail**/
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
index 0d6572cd..ee0810c1 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
@@ -27,6 +27,7 @@ import com.op.quality.service.IQcCheckTaskUserService;
import com.op.system.api.RemoteUserService;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
+import com.op.system.api.domain.quality.QcMaterialGroupDetailDTO;
import com.op.system.api.domain.quality.QcUserMaterialDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -158,17 +159,18 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
QcCheckTypeProject qctp= new QcCheckTypeProject();
qctp.setTypeId(qcCheckTaskProduce.getCheckType());//生产过程检验
qctp.setMaterialCode(qcCheckTaskProduce.getMaterialCode());//特性
- /**qc_check_type_project**/
+ /**qc_check_type_project**///个性
List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
- if(CollectionUtils.isEmpty(items)){
- /**qc_material_group_detail**/
- QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
- if(group == null){
- return 0;//没有找到检测项目
- }
- qctp.setGroupId(group.getGroupId());//共性
- items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
+
+ /**qc_material_group_detail**/
+ QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode());
+ if(group == null){
+ group = new QcMaterialGroupDetail();
+ group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");
}
+ qctp.setGroupId(group.getGroupId());//共性
+ List<QcCheckTaskDetail> itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
+ items.addAll(itemsGG);
/**qc_check_task_detail**/
if(CollectionUtils.isEmpty(items)){
From 26ab01f44c94d1e49b3feb716a86fadb68ba7ce0 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 22 Mar 2024 14:52:02 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=A5=E5=B7=A5+=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D+=E5=85=B6=E5=AE=83?=
=?UTF-8?q?=E7=BB=86=E8=8A=82=E5=8A=9F=E8=83=BD=E6=94=B9=E5=96=843?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 8fdca2a1..17c09b36 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -546,7 +546,7 @@
<select id="checkBatchCodes" resultType="java.lang.String">
select distinct batch_code
from pro_order_workorder_batch
- where del_flag='1' and batch_code in
+ where del_flag='0' and batch_code in
<foreach item="batch" collection="batchs" open="(" separator="," close=")">
#{batch.batchCode}
</foreach>
From 767eef01fbf6860610e6e7897132b658cfa03847 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 22 Mar 2024 15:17:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E5=B7=A5+=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D+=E5=85=B6=E5=AE=83?=
=?UTF-8?q?=E7=BB=86=E8=8A=82=E5=8A=9F=E8=83=BD=E6=94=B9=E5=96=844?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../op-open/src/main/resources/mapper/open/OpenMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
index aa7436fe..7255db33 100644
--- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
+++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
@@ -199,7 +199,7 @@
select qum.user_code userCode,
qum.user_name userName
from qc_user_material qum
- where qum.material_code = #{checkType} and pow.del_flag = '0' and qum.del_flag = '0'
+ where qum.material_code = #{checkType} and qum.del_flag = '0'
</select>
<select id="getSampNum" resultType="java.lang.String">
select sample_quality