From f45039571826094b733b8bc0b171a8b963ecca95 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 19:11:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?kjs=E5=8F=91=E8=B4=A7=E5=8D=95=E3=80=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=8823=E6=97=A519:11:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeliveryOrderPluginServiceImpl.java | 68 +++++++++++------- .../service/impl/KjsPluginBaseService.java | 66 +++++++++++++++++ .../impl/MomOrderPluginServiceImpl.java | 64 ++++++++++------- .../delivery/entity/DeliveryDetailEntity.xml | 26 +++---- .../delivery/entity/DeliveryOrderEntity.java | 60 +++++++++++++++- .../delivery/entity/DeliveryOrderEntity.xml | 28 +++++++- .../service/IDeliveryOrderService.java | 5 ++ .../impl/DeliveryOrderServiceImpl.java | 12 ++++ .../entity/MomOrderDetailEntity.java | 21 +++++- .../entity/MomOrderDetailEntity.xml | 18 ++--- .../u8/production/entity/MomOrderEntity.java | 70 ++++++++++++++++++- .../u8/production/entity/MomOrderEntity.xml | 26 ++++++- .../production/service/IMomOrderService.java | 7 ++ .../service/impl/MomOrderServiceImpl.java | 13 ++++ 14 files changed, 400 insertions(+), 84 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java index 73254486..4c4e328e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.plugin.kjs.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; @@ -18,6 +19,7 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.Date; @@ -29,7 +31,7 @@ import java.util.Map; * @Author xiangerlin * @Date 2024/8/22 16:46 **/ -public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginService { +public class DeliveryOrderPluginServiceImpl extends KjsPluginBaseService implements IDeliveryOrderPluginService { Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private IDeliveryOrderService deliveryOrderService; @@ -37,6 +39,7 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi private IDeliveryDetaiService deliveryDetaiService; @Resource private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + /** * 发货单同步到wsm * @param requestJson @@ -45,16 +48,26 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi @Override public String sync2wms(JSONObject requestJson) { if (null != requestJson){ + requestJson = super.check(requestJson); + //数据源编码 + String datasourceCode = requestJson.getString("sourceCode"); + //开始时间 + String startTime = requestJson.getString("startTime"); + //结束时间 + String endTime = requestJson.getString("endTime"); //1 查询发货单主表 DeliveryOrderEntity orderEntity = new DeliveryOrderEntity(); + orderEntity.setDataSourceCode(datasourceCode); String id = requestJson.getString("integration_task_living_details_id"); - if (StrUtil.isNotEmpty(id)){ + if (StrUtil.isEmpty(id)){ + orderEntity.setStartTime(startTime); + orderEntity.setEndTime(endTime); + //orderEntity.setDlid("1000000152"); + orderEntity.setbReturnFlag("0"); + }else { IntegrationTaskLivingDetailsEntity taskLivingDetails = taskLivingDetailsService.get(id); orderEntity.setDlid(taskLivingDetails.getRootAppPk()); } - orderEntity.setDataSourceCode("YONYOUU8"); - orderEntity.setDlid("1000000152"); - orderEntity.setbReturnFlag("0"); List orderList = deliveryOrderService.query(orderEntity); if (CollectionUtils.isNotEmpty(orderList)){ for (DeliveryOrderEntity order : orderList) { @@ -62,7 +75,7 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi //2 查询发货单明细表 DeliveryDetailEntity detailEntity = new DeliveryDetailEntity(); detailEntity.setDlid(order.getDlid()); - detailEntity.setDataSourceCode("YONYOUU8"); + detailEntity.setDataSourceCode(datasourceCode); List detailList = deliveryDetaiService.query(detailEntity); //发货单表头entity转dto DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order); @@ -73,28 +86,29 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi logger.info("发货单请求参数:{}",reqParams); //调用wms接口 Map headerMap = MapBuilder.create(true) - .put("apiCode", "") - .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") - .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") - .put("appId","") + .put("apiCode", "8000080006") + .put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj") + .put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","800008") .build(); - //String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParams).timeout(60000).execute().body(); - //保存日志 - IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); - taskLivingDetail.setCreate_time(new Date()); - taskLivingDetail.setModify_time(new Date()); - taskLivingDetail.setRootAppPk(order.getDlid()); - taskLivingDetail.setRootAppBill(order.getCdlcode()); - taskLivingDetail.setPluginId("kjsDeliveryOrderPlugin"); - taskLivingDetail.setRootAppNewData(reqParams); - //判断，成功调用这个方法 - //taskLivingDetailsService.saveLogToSuccess(taskLivingDetail); - //失败 调用这个方法 - //taskLivingDetailsService.saveLogToFail(taskLivingDetail); - //如果是重试 成功调这个方法 - //taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); - //如果是重试 失败调这个方法 - // taskLivingDetailsService.updateLogFailToSuccess(taskLivingDetail); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParams).timeout(60000).execute().body(); + //保存自定义项 标记推送状态 + order.setDataSourceCode(datasourceCode); + //deliveryOrderService.saveExtradefine(order); + if (StrUtil.isNotEmpty(body)){ + JSONObject jsonObject = JSONObject.parseObject(body); + Boolean flag = jsonObject.getBoolean("flag"); + //保存日志 + IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); + taskLivingDetail.setCreate_time(new Date()); + taskLivingDetail.setModify_time(new Date()); + taskLivingDetail.setRootAppPk(order.getDlid()); + taskLivingDetail.setRootAppBill(order.getCdlcode()); + taskLivingDetail.setPluginId("kjsDeliveryOrderPlugin"); + taskLivingDetail.setRootAppNewData(reqParams); + taskLivingDetail.setNewTransmitInfo(body); + this.saveLog(id,flag,taskLivingDetail); + } }catch(Exception e){ logger.error("同步发货单到wsm出错:{}",e); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java new file mode 100644 index 00000000..b11f8b4d --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/KjsPluginBaseService.java @@ -0,0 +1,66 @@ +package com.hzya.frame.plugin.kjs.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Resource; + +/** + * @Description 共用接口 + * @Author xiangerlin + * @Date 2024/8/23 18:45 + **/ +public class KjsPluginBaseService { + Logger logger = LoggerFactory.getLogger(getClass()); + @Resource + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + /** + * 检查请求参数 + * @param requestJson + * @return + */ + public JSONObject check(JSONObject requestJson) { + if (null == requestJson){ + requestJson = new JSONObject(); + } + if (StrUtil.isEmpty(requestJson.getString("sourceCode"))){ + requestJson.put("sourceCode","YONYOUU8"); + } + if (StrUtil.isEmpty(requestJson.getString("startTime"))){ + requestJson.put("startTime", DateUtil.now()); + } + if (StrUtil.isEmpty(requestJson.getString("endTime"))){ + requestJson.put("endTime", DateUtil.now()); + } + return requestJson; + } + + public void saveLog(String integration_task_living_details_id, Boolean flag, IntegrationTaskLivingDetailsEntity taskLivingDetail){ + try { + //判断，成功调用这个方法 + if (StrUtil.isEmpty(integration_task_living_details_id)){ + if (flag){ + taskLivingDetailsService.saveLogToSuccess(taskLivingDetail); + }else { + //失败 调用这个方法 + taskLivingDetailsService.saveLogToFail(taskLivingDetail); + } + }else { + if (flag){ + //如果是重试 成功调这个方法 + taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); + }else { + //如果是重试 失败调这个方法 + taskLivingDetailsService.updateLogFailToSuccess(taskLivingDetail); + } + } + }catch (Exception e){ + logger.error("保存日志出错:{}",e); + } + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java index bd60154a..11f40ac4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.plugin.kjs.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; @@ -18,6 +19,7 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.Date; @@ -29,7 +31,7 @@ import java.util.Map; * @Author xiangerlin * @Date 2024/8/23 09:21 **/ -public class MomOrderPluginServiceImpl implements IMomOrderPluginService { +public class MomOrderPluginServiceImpl extends KjsPluginBaseService implements IMomOrderPluginService { Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private IMomOrderService momOrderService; @@ -46,16 +48,26 @@ public class MomOrderPluginServiceImpl implements IMomOrderPluginService { @Override public String sync2wms(JSONObject requestJson) { if (null != requestJson){ - //1查询主表 + requestJson = super.check(requestJson); + //数据源编码 + String datasourceCode = requestJson.getString("sourceCode"); + //开始时间 + String startTime = requestJson.getString("startTime"); + //结束时间 + String endTime = requestJson.getString("endTime"); + MomOrderEntity entity = new MomOrderEntity(); + entity.setDataSourceCode(datasourceCode); String id = requestJson.getString("integration_task_living_details_id"); //如果这个id不为空说明是重试 - if (StrUtil.isNotEmpty(id)){ + if (StrUtil.isEmpty(id)){ + entity.setStartTime(startTime); + entity.setEndTime(endTime); + }else { IntegrationTaskLivingDetailsEntity taskLivingDetails = taskLivingDetailsService.get(id); entity.setMoId(taskLivingDetails.getRootAppPk()); } - entity.setMoId("1000000001"); - entity.setDataSourceCode("YONYOUU8"); + //1查询主表 List orderList = momOrderService.query(entity); if (CollectionUtils.isNotEmpty(orderList)){ for (MomOrderEntity order : orderList) { @@ -63,7 +75,7 @@ public class MomOrderPluginServiceImpl implements IMomOrderPluginService { //查询生产订单明细表 MomOrderDetailEntity detailEntity = new MomOrderDetailEntity(); detailEntity.setMoId(order.getMoId()); - detailEntity.setDataSourceCode("YONYOUU8"); + detailEntity.setDataSourceCode(datasourceCode); List detailList = momOrderDetailService.query(detailEntity); //表头转换dto MomOrderDTO momOrderDTO = MomOrderMapper.INSTANCE.momOrderEntityToDto(order); @@ -73,29 +85,29 @@ public class MomOrderPluginServiceImpl implements IMomOrderPluginService { String reqParam = JSONObject.toJSONString(momOrderDTO); logger.info("u8生产订单传wms请求参数：{}",reqParam); Map headerMap = MapBuilder.create(true) - .put("apiCode", "") + .put("apiCode", "8000080006") .put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj") .put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") - .put("appId","") + .put("appId","800008") .build(); - //String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParam).timeout(60000).execute().body(); - - //保存日志 - IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); - taskLivingDetail.setCreate_time(new Date()); - taskLivingDetail.setModify_time(new Date()); - taskLivingDetail.setRootAppPk(order.getMoId()); - taskLivingDetail.setRootAppBill(order.getMocode()); - taskLivingDetail.setPluginId("kjsMomOrderPlugin"); - taskLivingDetail.setRootAppNewData(reqParam); - //判断，成功调用这个方法 - //taskLivingDetailsService.saveLogToSuccess(taskLivingDetail); - //失败 调用这个方法 - //taskLivingDetailsService.saveLogToFail(taskLivingDetail); - //如果是重试 成功调这个方法 - //taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); - //如果是重试 失败调这个方法 - // taskLivingDetailsService.updateLogFailToSuccess(taskLivingDetail); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParam).timeout(60000).execute().body(); + if (StrUtil.isNotEmpty(body)){ + JSONObject jsonObject = JSONObject.parseObject(body); + Boolean flag = jsonObject.getBoolean("flag"); + //保存自定义项 标记推送状态 + order.setDataSourceCode(datasourceCode); + //momOrderService.saveExtradefine(order); + //保存日志 + IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); + taskLivingDetail.setCreate_time(new Date()); + taskLivingDetail.setModify_time(new Date()); + taskLivingDetail.setRootAppPk(order.getMoId()); + taskLivingDetail.setRootAppBill(order.getMocode()); + taskLivingDetail.setPluginId("kjsMomOrderPlugin"); + taskLivingDetail.setRootAppNewData(reqParam); + taskLivingDetail.setNewTransmitInfo(body); + this.saveLog(id,flag,taskLivingDetail); + } }catch (Exception e){ logger.error("生产订单同步wsm出错:{}",e); } diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml index 5190890e..c6ca041f 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml @@ -21,36 +21,32 @@ - dls.dlid, - dls.cwhcode, + dlid, + cwhcode, cwhname, - dls.cinvcode, - dls.cinvname, + cinvcode, + cinvname, cinvstd, iquantity, inum, - inv.ccomunitcode, - comUnit.ccomunitname, + ccomunitcode, + ccomunitname, casscomunitcode, - assUnit.ccomunitname as 'casscomunitname', + casscomunitname, cmemo, irowno, iorderrowno, csocode, - dls.itaxrate + itaxrate diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java index 0a2ea91f..0d4114cc 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java @@ -33,9 +33,20 @@ public class DeliveryOrderEntity extends BaseEntity { private String itaxrate; //备注 private String cmemo; - + //审核人 + private String cVerifier; //退货标记。 0发货 1退货 private String bReturnFlag; + //修改时间 + private String dmodifysystime; + //推送状态字段 + private String pushFlagField; + //帐套名 + private String dbname; + + private String startTime;//定时任务执行时传入的开始时间 + private String endTime;//定时任务执行时传入的结束时间 + public String getDlid() { return dlid; } @@ -139,4 +150,51 @@ public class DeliveryOrderEntity extends BaseEntity { public void setbReturnFlag(String bReturnFlag) { this.bReturnFlag = bReturnFlag; } + public String getDmodifysystime() { + return dmodifysystime; + } + + public void setDmodifysystime(String dmodifysystime) { + this.dmodifysystime = dmodifysystime; + } + + public String getPushFlagField() { + return pushFlagField; + } + + public void setPushFlagField(String pushFlagField) { + this.pushFlagField = pushFlagField; + } + + public String getDbname() { + return dbname; + } + + public void setDbname(String dbname) { + this.dbname = dbname; + } + + public String getcVerifier() { + return cVerifier; + } + + public void setcVerifier(String cVerifier) { + this.cVerifier = cVerifier; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml index 0a99f472..030b91d4 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml @@ -14,6 +14,9 @@ + + + dlid, @@ -27,13 +30,16 @@ cexch_name, iexchrate, itaxrate, - cmemo + cmemo, + dmodifysystime, + pushFlagField, + dbname + + + + insert into DispatchList_order_extradefine( + + dlid, + ${pushFlagField}, + + )values ( + + #{dlid}, + '1' + + ) + diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java index c1899285..2289c357 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java @@ -9,4 +9,9 @@ import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; * @Date 2024/8/22 15:12 **/ public interface IDeliveryOrderService extends IBaseService { + /** + * 保存自定义项 + * @param entity + */ + void saveExtradefine(DeliveryOrderEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java index d2e8e5c9..2555118b 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.u8.delivery.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.u8.delivery.dao.IDeliveryOrderDao; import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; @@ -24,4 +25,15 @@ public class DeliveryOrderServiceImpl extends BaseService + + MoId, - invCode as 'cinvcode', + cinvcode, cinvname, cinvstd, qty, auxqty, - dep.cDepName as 'mdeptname', - mdeptcode + mdeptname, + mdeptcode, + relsUser, + relsTime diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java index a535afb0..281af8fd 100644 --- a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java @@ -12,11 +12,22 @@ public class MomOrderEntity extends BaseEntity { private String moId; //生产订单号 private String mocode; - //制单日期 + //制单时间 private String createtime; //制单人 private String createuser; - + //创建日期 + private String createDate; + //修改日期 + private String modifyDate; + //修改时间 + private String modifytime; + //推送状态字段 + private String pushFlagField; + //帐套名 + private String dbname; + private String startTime;//定时任务执行时传入的开始时间 + private String endTime;//定时任务执行时传入的结束时间 public String getMoId() { return moId; } @@ -48,4 +59,59 @@ public class MomOrderEntity extends BaseEntity { public void setCreateuser(String createuser) { this.createuser = createuser; } + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getModifyDate() { + return modifyDate; + } + + public void setModifyDate(String modifyDate) { + this.modifyDate = modifyDate; + } + + public String getModifytime() { + return modifytime; + } + + public void setModifytime(String modifytime) { + this.modifytime = modifytime; + } + + public String getPushFlagField() { + return pushFlagField; + } + + public void setPushFlagField(String pushFlagField) { + this.pushFlagField = pushFlagField; + } + + public String getDbname() { + return dbname; + } + + public void setDbname(String dbname) { + this.dbname = dbname; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml index 01db99ce..f708925b 100644 --- a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml @@ -6,22 +6,44 @@ + + + moId, mocode, createtime, - createuser + createuser, + modifytime, + pushFlagField, + dbname + + + insert into mom_order_extradefine( + + moId, + ${cdefineField}, + + )values ( + + #{moId}, + '1' + + ) + diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java index 2c18bdc1..ae732a7d 100644 --- a/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java +++ b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java @@ -9,4 +9,11 @@ import com.hzya.frame.u8.production.entity.MomOrderEntity; * @Date 2024/8/23 08:54 **/ public interface IMomOrderService extends IBaseService { + + /** + * 保存自定义项 + * @param entity + * @return + */ + void saveExtradefine(MomOrderEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java index 6edba2f7..319a0d35 100644 --- a/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.hzya.frame.u8.production.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.u8.production.dao.IMomOrderDao; import com.hzya.frame.u8.production.entity.MomOrderEntity; @@ -23,4 +24,16 @@ public class MomOrderServiceImpl extends BaseService impl this.momOrderDao = dao; this.dao = dao; } + + /** + * 保存自定义项 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public void saveExtradefine(MomOrderEntity entity) { + momOrderDao.save("com.hzya.frame.u8.production.dao.impl.MomOrderDaoImpl.mom_order_extradefine_insert",entity); + } } From 1b7db9826a8b9a3edab002e7c58689ba49aeb3e5 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 19:12:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202024=E5=B9=B48=E6=9C=8823=E6=97=A519:11:57?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml index f90aeedf..3230c6c5 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml @@ -3,4 +3,5 @@ +