From dd6f38a8c54c6623b3e4ad840fe99d907398a9b7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 15 May 2024 13:37:28 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C+?= =?UTF-8?q?=E5=BE=AE=E4=BF=A12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskIncomeServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 fbfd4d83..e66489a3 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 @@ -617,7 +617,7 @@ public class QcCheckTaskIncomeServiceImpl implements } @Override - //@Transactional(rollbackFor = Exception.class) + @Transactional(rollbackFor = Exception.class) public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { List details = qcCheckTaskIncome.getQcCheckTaskDetails(); @@ -821,11 +821,11 @@ public class QcCheckTaskIncomeServiceImpl implements List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); if(!CollectionUtils.isEmpty(notices)) { List wecharts = new ArrayList<>(); - //去主库查微信id - DynamicDataSourceContextHolder.push("master");// 这是数据源的key - List userCodes = notices.stream() - .map(SysNoticeGroup::getUserCode) - .collect(Collectors.toList()); +// //去主库查微信id +// DynamicDataSourceContextHolder.push("master");// 这是数据源的key +// List userCodes = notices.stream() +// .map(SysNoticeGroup::getUserCode) +// .collect(Collectors.toList()); //Map wxidsMap = qcCheckTaskIncomeMapper.getWxIdMap(userCodes); for (SysNoticeGroup noticedto : notices) { // SysUser sysUser = wxidsMap.get(noticedto.getUserCode()); From f13ce73f4fed57d58c8037b7012f44e1fd6ea84f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 15 May 2024 16:08:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?2024-5-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E4=BF=AE=E6=94=B9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseProduct.java | 10 +++- .../impl/BaseProductAttachedServiceImpl.java | 9 +++- .../mapper/wms/BaseProductAttachedMapper.xml | 46 +++++++++++-------- .../mapper/wms/BaseProductMapper.xml | 3 ++ 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index d326c2be..d6e9580b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -20,6 +20,8 @@ public class BaseProduct extends BaseEntity { * 主键ID */ private String productId; + //附属属性表id + private String id; /** * 物料编码 @@ -481,11 +483,17 @@ public class BaseProduct extends BaseEntity { public void setProductId(String productId) { this.productId = productId; } - public String getProductId() { return productId; } + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + public void setProductCode(String productCode) { this.productCode = productCode; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java index f071c4db..76c23d2d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java @@ -2,9 +2,10 @@ package com.op.wms.service.impl; import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.wms.mapper.BaseProductAttachedMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.wms.mapper.BaseProductAttachedMapper; import com.op.wms.domain.BaseProductAttached; import com.op.wms.service.IBaseProductAttachedService; @@ -26,6 +27,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 物料附属信息 */ @Override + @DS("#header.poolName") public BaseProductAttached selectBaseProductAttachedById(String id) { return baseProductAttachedMapper.selectBaseProductAttachedById(id); } @@ -37,6 +39,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 物料附属信息 */ @Override + @DS("#header.poolName") public List selectBaseProductAttachedList(BaseProductAttached baseProductAttached) { return baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached); } @@ -48,6 +51,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 结果 */ @Override + @DS("#header.poolName") public int insertBaseProductAttached(BaseProductAttached baseProductAttached) { return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached); } @@ -59,6 +63,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 结果 */ @Override + @DS("#header.poolName") public int updateBaseProductAttached(BaseProductAttached baseProductAttached) { return baseProductAttachedMapper.updateBaseProductAttached(baseProductAttached); } @@ -70,6 +75,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 结果 */ @Override + @DS("#header.poolName") public int deleteBaseProductAttachedByIds(String[] ids) { return baseProductAttachedMapper.deleteBaseProductAttachedByIds(ids); } @@ -81,6 +87,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi * @return 结果 */ @Override + @DS("#header.poolName") public int deleteBaseProductAttachedById(String id) { return baseProductAttachedMapper.deleteBaseProductAttachedById(id); } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index fe78a321..00dc9f7a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -121,27 +121,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + update base_product_attached - - product_code = #{productCode}, - category = #{category}, - pc = #{pc}, - iei = #{iei}, - man_standar = #{manStandar}, - spray_way = #{sprayWay}, - blank_diameter = #{blankDiameter}, - blank_no = #{blankNo}, - spray_volume = #{sprayVolume}, - liquid_no = #{liquidNo}, - endometrial_dosage = #{endometrialDosage}, - outer_film_dosage = #{outerFilmDosage}, - support = #{support}, - support_no = #{supportNo}, - pvc = #{pvc}, - support_plate = #{supportPlate}, - other = #{other}, - + set + iei = #{iei}, + man_standar = #{manStandar} where id = #{id} 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 fce5f508..470477fd 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 @@ -65,6 +65,8 @@ + + @@ -163,6 +165,7 @@ bp.append_percent, bp.mtart, bp.report_rate, + bpa.id, bpa.category, bpa.pc, bpa.iei, From e548b0e3ce1b4dea32bb9d5d8606ecf823496be2 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 15 May 2024 17:16:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?2024-5-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E6=96=B0=E5=A2=9E=E9=99=84?= =?UTF-8?q?=E5=B1=9E=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/controller/BaseProductAttachedController.java | 2 +- .../wms/service/impl/BaseProductAttachedServiceImpl.java | 2 ++ .../resources/mapper/wms/BaseProductAttachedMapper.xml | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java index e2bfe046..838b6247 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java @@ -69,7 +69,7 @@ public class BaseProductAttachedController extends BaseController { /** * 新增物料附属信息 */ - @RequiresPermissions("wms:attached:add") + @RequiresPermissions("wms:attached:edit") @Log(title = "物料附属信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BaseProductAttached baseProductAttached) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java index 76c23d2d..28e09ab3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java @@ -3,6 +3,7 @@ package com.op.wms.service.impl; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.uuid.IdUtils; import com.op.wms.mapper.BaseProductAttachedMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,6 +54,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi @Override @DS("#header.poolName") public int insertBaseProductAttached(BaseProductAttached baseProductAttached) { + baseProductAttached.setId(IdUtils.fastSimpleUUID()); return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached); } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index 00dc9f7a..81ecda8b 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -84,8 +84,8 @@ product_code, category, pc, - iei, - man_standar, + iei, + man_standar, spray_way, blank_diameter, blank_no, @@ -104,8 +104,8 @@ #{productCode}, #{category}, #{pc}, - #{iei}, - #{manStandar}, + #{iei}, + #{manStandar}, #{sprayWay}, #{blankDiameter}, #{blankNo}, From 739e8edee16fd2a8acf2522928cd3f8fae8d2fa7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 16 May 2024 13:59:32 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E4=BA=A7=E9=87=8F?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/mapper/MesMapper.java | 2 +- .../service/impl/IWCInterfaceServiceImpl.java | 54 +++++++++++++------ .../main/resources/mapper/mes/MesMapper.xml | 14 +++-- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index 25aefcf8..055142c8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -101,7 +101,7 @@ public interface MesMapper { List getUnChangeList(MesStationArrive dto); - List getChangeInfos(BaseEquipmentDto dto); + MesShift getChangeInfos(BaseEquipmentDto dto); ProOrderWorkorderDTO getActOrderWork(MesStationArrive qo); 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 3b20a3cd..70f03df7 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 @@ -646,7 +646,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { DynamicDataSourceContextHolder.push("ds_999");// 这是数据源的key BaseEquipmentDto edto = new BaseEquipmentDto(); - edto.setEquipmentTypeCode("equTypeCxj"); + edto.setEquipmentTypeCode("equ_type_cxj"); List cxjList = mesMapper.getAllEquipments(edto); ExecutorService executorService = new ThreadPoolExecutor( cxjList.size(), @@ -655,7 +655,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { new LinkedBlockingQueue()); try { cxjList.forEach(cxj -> { - if(cxj.getEquipmentCode().equals("C4")){ + if(cxj.getEquipmentCode().equals("C5")){ Runnable run = () -> changeTransferResultFunc(cxj); executorService.execute(run); } @@ -675,18 +675,43 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { */ private R changeTransferResultFunc(BaseEquipmentDto cxj){ logger.info("++++++++++++" + cxj.getEquipmentCode() + "++++班次交接最后一车数据修正++++++++++"); + DynamicDataSourceContextHolder.push("ds_999");// 这是数据源的key DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 定义日期格式 LocalDate today = LocalDate.now(); - String ymdT0 = today.format(formatter); // 格式化今天的日期 + LocalDate qianDay = today.minusDays(2); + String qianDayStr = qianDay.format(formatter); // 格式化前天的日期 LocalDate yesterday = today.minusDays(1); - String ymd = yesterday.format(formatter); // 格式化昨天的日期 - cxj.setYmd("'"+ymdT0+"','"+ymd+"'"); - List changeInfos = mesMapper.getChangeInfos(cxj); + String yesterdayStr = yesterday.format(formatter); // 格式化昨天的日期 + + List changeInfos = new ArrayList<>(); + //昨天的白班开始 + cxj.setYmd(qianDayStr); + cxj.setShiftId("2"); + MesShift changeInfo0 = mesMapper.getChangeInfos(cxj); + changeInfo0.setShiftId(5);//昨天的白班 + changeInfos.add(changeInfo0); + //昨天的白班结束 昨天的夜班开始 + cxj.setYmd(yesterdayStr); + cxj.setShiftId("5"); + MesShift changeInfo1 = mesMapper.getChangeInfos(cxj); + changeInfo1.setShiftId(2);//昨天的夜班 + changeInfos.add(changeInfo1); + //昨天的白班结束 昨天的夜班开始 + cxj.setYmd(yesterdayStr); + cxj.setShiftId("2"); + MesShift changeInfo2 = mesMapper.getChangeInfos(cxj); + changeInfos.add(changeInfo2); + if(CollectionUtils.isEmpty(changeInfos)){ logger.info("++++++++++++班次交接最后一车数据修正:无数据++++++++++"+JSONObject.toJSONString(cxj)); return R.fail("班次交接最后一车数据修正:无数据"); } - List todoList = new ArrayList<>(); + + if(changeInfos.size()<3){ + logger.info("++++++++++++班次交接最后一车数据修正:修正点缺失（必须三个点）++++++++++"); + return R.fail("班次交接最后一车数据修正:无数据"); + } + for(int m=0;m todos1 = mesMapper.getUnChangeList(qo);//需要调整的数据 - todoList.addAll(todos1); - - if(!CollectionUtils.isEmpty(todoList)){ - continue; - } - qo.setReqCode(ymd);//工单日期 + qo.setReqCode(yesterdayStr);//工单日期 ProOrderWorkorderDTO actOrderWork = mesMapper.getActOrderWork(qo); if(actOrderWork != null){//给需要调整的数据，重新赋值新的班次，工单Id Date nowDate = DateUtils.getNowDate(); - for(MesStationArrive newtodo:todoList){ + for(MesStationArrive newtodo:todos1){ newtodo.setChangeOrderWorkId(actOrderWork.getWorkorderId()); newtodo.setShiftId(Integer.parseInt(actOrderWork.getShiftId())); newtodo.setChangeWorkDate(actOrderWork.getProductDate()); @@ -716,10 +736,10 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } } /**mes_material_transfer_result**/ - int n = mesMapper.updateTransferResult(todoList); - logger.info("++++++++++++班次交接最后一车数据修正:修正成功"+n+"++++++++++"+JSONObject.toJSONString(todoList)); + int n = mesMapper.updateTransferResult(todos1); + logger.info("++++++++++++班次交接最后一车数据修正:班次"+changeInfos.get(m).getShiftId()+"修正成功" + +n+"++++++++++"+JSONObject.toJSONString(todos1)); } - logger.info("++++++++++++班次交接最后一车数据修正:数据条数++++++++++"+todoList.size()); return R.fail("班次交接最后一车数据修正:完成"); } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 67be04af..376eea2a 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -430,14 +430,12 @@ and shift_id != #{shiftId}