From 1a331d6b42275be8bebd691d0f097353b316f47c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 29 Feb 2024 14:51:54 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=A4=9A=E5=B1=82=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=94=B9=E9=80=A02.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/RemoteSapService.java | 2 +- .../api/factory/RemoteSapFallbackFactory.java | 2 +- .../java/com/op/plan/domain/ProOrder.java | 10 ++++++- .../impl/ProOrderWorkorderServiceImpl.java | 30 +++++++------------ .../resources/mapper/plan/ProOrderMapper.xml | 3 ++ 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index 97ab0a3c3..0a84fae2b 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -36,7 +36,7 @@ public interface RemoteSapService { /**回传sap母工单**/ @PostMapping("/sap/sapCreateOrder") - public R>> SapCreateOrder(@RequestBody List sapCreateOrderList); + public R> SapCreateOrder(@RequestBody List sapCreateOrderList); /**关闭订单**/ @PostMapping("/sap/sapCloseOrder") diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index 1cafde652..e9709b2a3 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -35,7 +35,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory>> SapCreateOrder(List sapCreateOrderList) { + public R> SapCreateOrder(List sapCreateOrderList) { return R.fail("回传sap工单失败:" + throwable.getMessage()); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index a27e7b588..f42c0aa78 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -19,7 +19,7 @@ public class ProOrder extends TreeEntity { /** ID */ private String id; - + private String cegci; /** 计划工厂编码 */ private String planFactoryCode; @@ -357,6 +357,14 @@ public class ProOrder extends TreeEntity { this.sortNo = sortNo; } + public String getCegci() { + return cegci; + } + + public void setCegci(String cegci) { + this.cegci = cegci; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index ed4f774b3..cccd8b355 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -355,20 +355,14 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { ordercodes.add(whiteOrder.getOrderCode()); Boolean isNotTop = true; //成品的母工单//查下一级工单 + ProOrderWorkorder queryWorkOrder = whiteOrder; while (isNotTop) { - if(!"0".equals(whiteOrder.getParentOrder())){ - //查上一级工单 - whiteOrder.setWorkorderCode(whiteOrder.getParentOrder()); - ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(whiteOrder); - if (sWorkOrder != null) { - wids.add(sWorkOrder.getWorkorderId()); - wcodes.add(sWorkOrder.getWorkorderCode()); - ordercodes.add(sWorkOrder.getOrderCode()); - } - if ("0".equals(sWorkOrder.getParentOrder())) { - BeanUtils.copyProperties(sWorkOrder, whiteOrder); - isNotTop = false; - } + ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(queryWorkOrder); + if (sWorkOrder != null) { + wids.add(sWorkOrder.getWorkorderId()); + wcodes.add(sWorkOrder.getWorkorderCode()); + ordercodes.add(sWorkOrder.getOrderCode()); + queryWorkOrder.setWorkorderCode(sWorkOrder.getWorkorderCode()); }else{ isNotTop = false; } @@ -390,7 +384,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { sapList.add(sap); logger.info(whiteOrder.getWorkorderCode() + "sap工单回传sap工单号开始：" + JSONObject.toJSONString(sapList)); - R>> r = remoteSapService.SapCreateOrder(sapList); + R> r = remoteSapService.SapCreateOrder(sapList); logger.info("sap工单回传：" + r.getMsg()); if (500 == r.getCode()) { logger.error("工单派发sap工单回传：(sap订单创建失败)" + r.getMsg()); @@ -398,12 +392,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } else { logger.info("工单派发sap工单回传：(sap订单创建成功)" + JSONObject.toJSONString(r)); } - List> returnMaps = r.getData(); - List returnCodes = new ArrayList<>(); - for (Map mapdto : returnMaps) { - returnCodes.add(mapdto.get("LEAD_AUFNR")); - returnCodes.add(mapdto.get("AUFNR")); - } + List returnCodes = r.getData(); + Date updateTime = DateUtils.getNowDate(); if (!CollectionUtils.isEmpty(returnCodes)) { logger.info("sap工单回传sap工单号结束：" + StringUtils.join(returnCodes, ",")); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 06947080a..ca2fdd696 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -229,6 +229,7 @@ car_num, sync_user, from_sap_time, + cegci, #{id}, @@ -258,6 +259,7 @@ #{carNum}, #{syncUser}, GETDATE(), + #{cegci}, @@ -294,6 +296,7 @@ prod_type = #{prodType}, prod_spc = #{prodSpc}, from_sap_time = GETDATE(), + cegci = #{cegci}, sync_user = #{syncUser}, where id = #{id} From e37f464ea8a4bd619b27347c2fa879858ec287b6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 29 Feb 2024 16:52:50 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=8D=95=E5=B1=82=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/mapper/MesReportWorkMapper.java | 2 + .../service/impl/IWCInterfaceServiceImpl.java | 85 +++++++++++++------ .../mapper/mes/MesReportWorkMapper.xml | 25 ++++++ 3 files changed, 84 insertions(+), 28 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index a5189bd3c..d4dd9335e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -136,4 +136,6 @@ public interface MesReportWorkMapper { List getPutInOrderList(MesReportWork mesReportWorks); ProOrderWorkorder getSonWorkOrder(String workorderCode); + + public MesReportWork getReportWorkHz1(MesReportWork mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 1f90b4aa5..7985689a8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -287,6 +287,24 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { /**** * 报工顺序：先子单报工，然后母单报工 * 关闭母工单，关闭子工单 + * * 一层---------------------------------------- + * * 工单进行报工的时候公式调整如下（数值单位不用管）： + * * 机器=开机时长 + * * 人工 = 用人数*机器（开机时长） + * * 折旧 = 机器 + * * 其它 = 人工 + * * 二层---------------------------------------- + * * 子单进行报工的时候公式调整如下（数值单位不用管）： + * * 机器=sum(工时数/用人数) + * * 人工 = 用人数*机器 + * * 折旧 = 机器 + * * 其它 = 人工 + * *

+ * * 母单进行报工的时候公式调整如下： + * * 机器=子单机器 + * * 人工 = 管理系统维护的用人数*机器 + * * 折旧 = 机器 + * * 其它 = 人工 * @param mesReportWork * @return */ @@ -303,49 +321,60 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return R.fail("子母工单信息缺失"); } R sapRson = null; - /**子工单先报工，然后母工单报工:workOrders内容就是-子子母**/ - for(MesReportWork workOrder:workOrders){ + if(workOrders.size()==1){ + /**(一层报工)工单报工**/ mesReportWork.setUploadStatus("1");//除了1报工成功的，都需要报工 mesReportWork.setProdType("prod"); - mesReportWork.setWorkorderCode(workOrder.getWorkorderCode()); - MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if (sHzWorks == null) { - return R.fail(workOrder.getWorkorderCode()+"未查询到报工单"); + mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); + MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz1(mesReportWork); + if(sHzWorks==null){ + return R.fail("未查询到一层报工单"); } //子工单报工 - logger.info("==========================工单("+sHzWorks.getWorkorderCodeSap()+")报工开始"); + logger.info("==========================一层工单报工开始"); sapRson = this.reportHzToSap(sHzWorks); - logger.info("==========================工单("+sHzWorks.getWorkorderCodeSap()+")报工结束:" - + JSONObject.toJSONString(sapRson)); - if (sapRson.getCode() == 200) { + logger.info("==========================一层工单报工结束:"+JSONObject.toJSONString(sapRson)); + }else if(workOrders.size()==2){ + /**(两层报工)子工单先报工，然后母工单报工**/ + mesReportWork.setUploadStatus("1");//除了1报工成功的，都需要报工 + mesReportWork.setProdType("prod"); + mesReportWork.setWorkorderCode(workOrders.get(1).getWorkorderCode()); + MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); + if(sHzWorks==null){ + return R.fail("未查询到子报工单"); + } + //子工单报工 + logger.info("==========================子工单报工开始"); + sapRson = this.reportHzToSap(sHzWorks); + logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson)); + if(sapRson.getCode()== 200){ + //一定是子单报工成功返回后，再母单报工 + mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); + MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); + if(pHzWork==null){ + return R.fail("未查询到母报工单"); + } try { Thread.sleep(3000); - } catch (Exception e) { + }catch (Exception e){ e.printStackTrace(); } - //最终报工标识且sap报工成功：关闭子母工单 - //MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork); - }else{ - //报工不成功跳出循环 - break; + //母工单报工 + logger.info("==========================母工单报工开始"); + pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); + pHzWork.setSac1(sHzWorks.getSac1()); + R sapR = this.reportHzToSap(pHzWork); + logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR)); + return sapR; } - } + }else if(workOrders.size()==3){ + //20240301 TODO; + } return sapRson; } /** - * 子单进行报工的时候公式调整如下（数值单位不用管）： - * 机器=sum(工时数/用人数) - * 人工 = 用人数*机器 - * 折旧 = 机器 - * 其它 = 人工 - *

- * 母单进行报工的时候公式调整如下： - * 机器=子单机器 - * 人工 = 管理系统维护的用人数*机器 - * 折旧 = 机器 - * 其它 = 人工 * * @param workOrder * @return diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 9bbf13593..1fa5cbf0e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -588,6 +588,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code + - and supplier_code like concat('%', #{supplierCode}, - '%') - + and supplier_code like concat('%', #{supplierCode},'%') and zh_desc like concat('%', #{zhDesc}, '%') and en_desc = #{enDesc} and supplier_type = #{supplierType} @@ -56,9 +54,7 @@ and address = #{address} and postcode = #{postcode} and contact like concat('%', #{contact}, '%') - and contact_phone like concat('%', #{contactPhone}, - '%') - + and contact_phone like concat('%', #{contactPhone},'%') and contact_position = #{contactPosition} and contact_email = #{contactEmail} and active_flag = #{activeFlag} @@ -67,6 +63,7 @@ and user_defined3 = #{userDefined3} and del_flag = '0' + order by supplier_code asc + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsWhiteEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsWhiteEmbryoMapper.xml index f1e3623ba..587658c98 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsWhiteEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsWhiteEmbryoMapper.xml @@ -12,7 +12,7 @@ - + @@ -54,7 +54,7 @@ and Material_Desc = #{materialDesc} and Plan_Date = #{planDate} and Plan_Number = #{planNumber} - and Unit = #{Unit} + and Unit = #{unit} and Reality_Number = #{realityNumber} and Order_Status = #{orderStatus} and User_Defined1 = #{userDefined1} @@ -105,7 +105,7 @@ Material_Desc, Plan_Date, Plan_Number, - Unit, + Unit, Reality_Number, Order_Status, User_Defined1, @@ -141,7 +141,7 @@ #{materialDesc}, #{planDate}, #{planNumber}, - #{Unit}, + #{unit}, #{realityNumber}, #{orderStatus}, #{userDefined1}, @@ -180,7 +180,7 @@ Material_Desc = #{materialDesc}, Plan_Date = #{planDate}, Plan_Number = #{planNumber}, - Unit = #{Unit}, + Unit = #{unit}, Reality_Number = #{realityNumber}, Order_Status = #{orderStatus}, User_Defined1 = #{userDefined1}, @@ -221,4 +221,9 @@ #{ID} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml index 6101dab94..c369e8b59 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml @@ -218,4 +218,8 @@ gmt_modified=now() where wh_code=#{whCode} and wl_code=#{wlCode} and material_code=#{materialCode} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsSnMapper.xml index daa01c71c..ce6445ea1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsSnMapper.xml @@ -190,4 +190,8 @@ #{emOrderInSnId} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml index 37ab85f9a..a7b6f5b3f 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml @@ -12,7 +12,7 @@ - + @@ -55,7 +55,7 @@ and Material_Desc = #{materialDesc} and Plan_Date = #{planDate} and Plan_Number = #{planNumber} - and Unit = #{Unit} + and Unit = #{unit} and Reality_Number = #{realityNumber} and Order_Status = #{orderStatus} and User_Defined1 = #{userDefined1} @@ -113,7 +113,7 @@ Material_Desc, Plan_Date, Plan_Number, - Unit, + Unit, Reality_Number, Order_Status, User_Defined1, @@ -149,7 +149,7 @@ #{materialDesc}, #{planDate}, #{planNumber}, - #{Unit}, + #{unit}, #{realityNumber}, #{orderStatus}, #{userDefined1}, @@ -188,7 +188,7 @@ Material_Desc = #{materialDesc}, Plan_Date = #{planDate}, Plan_Number = #{planNumber}, - Unit = #{Unit}, + Unit = #{unit}, Reality_Number = #{realityNumber}, Order_Status = #{orderStatus}, User_Defined1 = #{userDefined1}, @@ -238,4 +238,43 @@ Last_Update_Date = now() where Order_Code=#{orderCode} + + + + + From 3504cefcb167186de3e565bdd328d42dd3296b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Mon, 4 Mar 2024 10:56:01 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=B2=89=E6=96=99=E6=8E=A5=E5=8F=A3?= 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 686cd721d..b606be859 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 @@ -117,7 +117,7 @@ pw.material_name materialName from pro_wet_material_plan_detail pw - where CONVERT(varchar(10),plan_time, 120) = #{reqTime} + where CONVERT(varchar(10),plan_time, 120) = #{reqTime} AND sync_flag='Y' AND del_flag='0' + + - - select work_code AS workCode, work_person AS workPerson, @@ -684,8 +682,7 @@ and del_flag = '0' - select order_code AS orderCode, CONCAT(plan_loop, plan_loop_type) AS planLoop, diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 2b0bdf6a0..204cd45e9 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -73,19 +73,13 @@ + + From e69adf1ea17584a32bc1800516bfc2b8f727f9b0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 6 Mar 2024 15:14:57 +0800 Subject: [PATCH 11/13] =?UTF-8?q?wms=E7=99=BD=E5=9D=AF=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/wms/OdsProcureOutOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 9fc4f7bde..761dd7bea 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -402,10 +402,10 @@ diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 4ad92d762..42429401e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -106,6 +106,7 @@ from mes_report_work_consume mrwc where mrwc.del_flag = '0' and mrwc.workorder_code = #{workorderCode} + order by mrwc.recoil + select qct.record_id, qct.check_no, qct.income_batch_no, + qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, + qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, + qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, + qct.create_by,qct.create_time, qct.update_by, qct.update_time, + qct.check_type,qct.sample_quality,qct.noOk_quality, + q.type_code + from qc_check_task qct + left join qc_check_type q on q.id = qct.check_type + + and qct.check_no = #{checkNo} + and qct.income_batch_no = #{incomeBatchNo} + and qct.order_no = #{orderNo} + and qct.material_code = #{materialCode} + and qct.material_name like concat('%', + #{materialName}, '%') + + and qct.supplier_code = #{supplierCode} + and qct.supplier_name like concat('%', + #{supplierName}, '%') + + and qct.income_time = #{incomeTime} + and qct.check_loc = #{checkLoc} + and qct.check_status = #{checkStatus} + and qct.check_man_code = #{checkManCode} + and qct.check_man_name like concat('%', + #{checkManName}, '%') + + and qct.check_result = #{checkResult} + and qct.status = #{status} + and qct.del_flag = #{delFlag} + and qct.factory_code = #{factoryCode} + and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart} + and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120) + and CONVERT(varchar(30),qct.check_time, 120) >= #{checkTimeStart} + and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) + and qct.check_type = #{checkType} + and q.type_code = #{typeCode} + + + + + + + insert into qc_check_task + + record_id, + check_no, + income_batch_no, + order_no, + material_code, + material_name, + quality, + unit, + supplier_code, + supplier_name, + income_time, + check_loc, + check_status, + check_man_code, + check_man_name, + check_time, + check_result, + status, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + check_type, + noOk_quality, + sample_quality, + aNoOkquality, + bNoOkquality, + cNoOkquality, + type_code, + order_type, + + + #{recordId}, + #{checkNo}, + #{incomeBatchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{checkType}, + #{noOkQuality}, + #{sampleQuality}, + #{aNoOkquality}, + #{bNoOkquality}, + #{cNoOkquality}, + #{typeCode}, + #{orderType}, + + + + + update qc_check_task + + check_no = #{checkNo}, + income_batch_no = #{incomeBatchNo}, + order_no = #{orderNo}, + material_code = #{materialCode}, + material_name = #{materialName}, + quality = #{quality}, + unit = #{unit}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + income_time = #{incomeTime}, + check_loc = #{checkLoc}, + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name = #{checkManName}, + check_time = #{checkTime}, + check_result = #{checkResult}, + status = #{status}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + check_type = #{checkType}, + noOk_quality = #{noOkQuality}, + sample_quality = #{sampleQuality}, + aNoOkquality = #{aNoOkquality}, + bNoOkquality = #{bNoOkquality}, + cNoOkquality = #{cNoOkquality}, + type_code = #{typeCode}, + order_type = #{orderType}, + + where record_id = #{recordId} + + + + delete from qc_check_task where record_id = #{recordId} + + + + delete from qc_check_task where record_id in + + #{recordId} + + + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml index e82284584..0a130ef10 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml @@ -34,7 +34,7 @@ and attr1 = #{attr1} and del_flag = '0' - order by create_time + order by type_code + - +