From 7e7c52a56a643204ce3e8f5024df9e39df7ccc55 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 27 Sep 2022 16:14:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/portal/biz/sysmapping/SysMappingService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java index af0eb944ac..2bec9b3548 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -28,25 +28,15 @@ package com.yxt.anrui.portal.biz.sysmapping; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.sun.org.apache.regexp.internal.RE; -import com.yxt.anrui.portal.api.dictcommon.DictCommon; -import com.yxt.anrui.portal.api.dicttype.DictType; -import com.yxt.anrui.portal.biz.dictcommon.DictCommonService; -import com.yxt.anrui.portal.biz.dicttype.DictTypeService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.portal.api.sysmapping.SysMapping; import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingDetailsVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingDto; -import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; From 0fd98721746246db60a2933cbbcf7a63d792304b Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 27 Sep 2022 16:28:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0com.sun.xml.ws=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E6=8C=87=E5=AE=9Alombok=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-api/pom.xml | 1 + anrui-scm/anrui-scm-biz/pom.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/anrui-scm/anrui-scm-api/pom.xml b/anrui-scm/anrui-scm-api/pom.xml index bac4187cd2..b5d623076b 100644 --- a/anrui-scm/anrui-scm-api/pom.xml +++ b/anrui-scm/anrui-scm-api/pom.xml @@ -27,6 +27,7 @@ org.projectlombok lombok + 1.18.24 true diff --git a/anrui-scm/anrui-scm-biz/pom.xml b/anrui-scm/anrui-scm-biz/pom.xml index c217aaf175..d920e9702c 100644 --- a/anrui-scm/anrui-scm-biz/pom.xml +++ b/anrui-scm/anrui-scm-biz/pom.xml @@ -83,6 +83,20 @@ message-center-api 0.0.1 + + + + com.sun.xml.ws + jaxws-ri + 2.3.2 + pom + + + org.projectlombok + lombok + 1.18.24 + true + From dbc624dd23b008c02c8b27fe4f997d8e5900be15 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 27 Sep 2022 16:56:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 2 +- .../BusDeliveredApplyService.java | 9 -- .../fin/api/kingdee/appaybill/ApPayBill.java | 4 - .../api/kingdee/saloutstock/SalOutStock.java | 8 +- .../stktransferdirect/StkTransferDirect.java | 117 +++++++++--------- .../FinPaymentrecordService.java | 2 +- .../SalOutStockCastToKingDeeBillFields.java | 1 + .../biz/kingdee/saloutstock/data_FEntity.json | 4 +- ...TransferDirectCastToKingDeeBillFields.java | 3 + .../stktransferdirect/data_FBillEntry.json | 26 ++-- .../kingdee/stktransferdirect/data_model.json | 22 ++-- .../ScmApplyInboundService.java | 6 - .../ScmVehicleEnterlibraryService.java | 18 --- .../ScmVehicleGressionService.java | 19 --- 14 files changed, 96 insertions(+), 145 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index e1ed5e578d..c001c64718 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -561,7 +561,7 @@ public class BaseAccadjApplyService extends MybatisBaseService listResultBean = finKingDeeFeign.draftSalOutStock(s); - }catch (Exception e){ - - }*/ } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index 29bc2b4536..027a43f1af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -14,10 +14,6 @@ import java.util.List; @Data public class ApPayBill { - @JsonProperty("FPOSTDATE") - @NotBlank - //登账日期:FPOSTDATE (必填项) - public String FPOSTDATE; @JsonProperty("FDATE") @NotBlank //业务日期:FDATE (必填项) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java index 407f1f59de..62c4cabeb0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java @@ -84,9 +84,9 @@ public class SalOutStock { public String Flot; /** * 货主:FOwnerID (必填项) - */ @JsonProperty("FOwnerID") + */ /*@JsonProperty("FOwnerID") @NotBlank - public String FOwnerID; + public String FOwnerID;*/ /** * 仓库:FStockID */ @JsonProperty("FStockID") @@ -94,9 +94,9 @@ public class SalOutStock { public String FStockID; /** * 库存状态:FStockStatusID - */ @JsonProperty("FStockStatusID") + *//* @JsonProperty("FStockStatusID") @NotBlank - public String FStockStatusID; + public String FStockStatusID;*/ /** * 销售单位:FSalUnitID */ @JsonProperty("FSalUnitID") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index 2119d4dd70..ead3f590f9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -18,66 +18,65 @@ public class StkTransferDirect { @Data public static class FBillEntry{ /* 调入库存状态:FDestStockStatusId (必填项)*/ - @JsonProperty("FDestStockStatusId") + /*@JsonProperty("FDestStockStatusId") @NotBlank - public String FDestStockStatusId; + public String FDestStockStatusId;*/ /* 调入仓库 (必填项)*/ @JsonProperty("FDestStockId") @NotBlank public String FDestStockId; /*调出库存状态:FSrcStockStatusId (必填项)*/ - @JsonProperty("FSrcStockStatusId") + /* @JsonProperty("FSrcStockStatusId") @NotBlank - public String FSrcStockStatusId; + public String FSrcStockStatusId;*/ /*基本单位:FBaseUnitId (必填项)*/ //@JsonProperty("FBaseUnitId") // @NotBlank // public String FBaseUnitId; /*调入货主类型:FOwnerTypeId (必填项)*/ - @JsonProperty("FOwnerTypeId") + /* @JsonProperty("FOwnerTypeId") @NotBlank - public String FOwnerTypeId; + public String FOwnerTypeId;*/ /* 调出保管者:FKeeperOutId (必填项)*/ - @JsonProperty("FKeeperOutId") + /* @JsonProperty("FKeeperOutId") @NotBlank - public String FKeeperOutId; + public String FKeeperOutId;*/ /* 调出货主:FOwnerOutId (必填项)*/ - @JsonProperty("FOwnerOutId") + /* @JsonProperty("FOwnerOutId") @NotBlank - public String FOwnerOutId; + public String FOwnerOutId;*/ /*调出批号:FLot*/ - @JsonProperty("FLot") + /* @JsonProperty("FLot") @NotBlank - public String FLot; + public String FLot;*/ /* 调出货主类型:FOwnerTypeOutId (必填项)*/ - @JsonProperty("FOwnerTypeOutId") + /*@JsonProperty("FOwnerTypeOutId") @NotBlank - public String FOwnerTypeOutId; + public String FOwnerTypeOutId;*/ + /* 业务日期 */ + /* @JsonProperty("FOwnerTypeOutId") + @NotBlank + public String FBusinessDate;*/ /*调入批号:FDestLot*/ - @JsonProperty("FDestLot") + /* @JsonProperty("FDestLot") @NotBlank - public String FDestLot; + public String FDestLot;*/ /* 调入货主:FOwnerId (必填项)*/ - @JsonProperty("FOwnerId") - @NotBlank - public String FOwnerId; - /* 调入货主:FOwnerIdHead (必填项)*/ - @JsonProperty("FOwnerIdHead") + /* @JsonProperty("FOwnerId") @NotBlank - public String FOwnerIdHead; + public String FOwnerId;*/ /* 调出保管者类型:FKeeperTypeOutId (必填项)*/ - @JsonProperty("FKeeperTypeOutId") + /* @JsonProperty("FKeeperTypeOutId") @NotBlank - public String FKeeperTypeOutId; + public String FKeeperTypeOutId;*/ /* 调入保管者:FKeeperId (必填项)*/ - @JsonProperty("FKeeperId") + /*@JsonProperty("FKeeperId") @NotBlank - public String FKeeperId; + public String FKeeperId;*/ /* 调入保管者类型:FKeeperTypeId (必填项)*/ - @JsonProperty("FKeeperTypeId") + /* @JsonProperty("FKeeperTypeId") @NotBlank - public String FKeeperTypeId; - + public String FKeeperTypeId;*/ /* 单位:FUnitID (必填项)*/ // @JsonProperty("FUnitID") // @NotBlank @@ -91,34 +90,38 @@ public class StkTransferDirect { @NotBlank public String FSrcStockId; } + /* 调入货主:FOwnerIdHead (必填项)*/ + @JsonProperty("FOwnerIdHead") + @NotBlank + public String FOwnerIdHead; /* 调出库存组织:FStockOutOrgId (必填项)*/ @JsonProperty("FStockOutOrgId") @NotBlank public String FStockOutOrgId; /* 调拨类型:FTransferBizType (必填项)*/ - @JsonProperty("FTransferBizType") + /*@JsonProperty("FTransferBizType") @NotBlank - public String FTransferBizType; + public String FTransferBizType;*/ /* 调拨方向:FTransferDirect (必填项)*/ - @JsonProperty("FTransferDirect") + /* @JsonProperty("FTransferDirect") @NotBlank - public String FTransferDirect; + public String FTransferDirect;*/ /* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/ - @JsonProperty("FOwnerTypeOutIdHead") + /*@JsonProperty("FOwnerTypeOutIdHead") @NotBlank - public String FOwnerTypeOutIdHead; + public String FOwnerTypeOutIdHead;*/ /* 调入库存组织:FStockOrgId (必填项)*/ @JsonProperty("FStockOrgId") @NotBlank public String FStockOrgId; /* 调入货主类型:FOwnerTypeIdHead (必填项)*/ - @JsonProperty("FOwnerTypeIdHead") + /*@JsonProperty("FOwnerTypeIdHead") @NotBlank - public String FOwnerTypeIdHead; + public String FOwnerTypeIdHead;*/ /* 单据类型:FBillTypeID (必填项)*/ - @JsonProperty("FBillTypeID") + /*@JsonProperty("FBillTypeID") @NotBlank - public String FBillTypeID; + public String FBillTypeID;*/ /* 日期:FDate (必填项)*/ @JsonProperty("FDate") @NotBlank @@ -136,27 +139,27 @@ public class StkTransferDirect { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date=new Date(); /* 单据类型:FBillTypeID (必填项)*/ - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); + //stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); /* 日期:FDate (必填项)*/ stkTransferDirect.setFDate(sdf.format(date)); /* 调出库存组织:FStockOutOrgId (必填项)*/ stkTransferDirect.setFStockOutOrgId("101"); /* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/ - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); + //stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); /* 调拨类型:FTransferBizType (必填项)*/ - stkTransferDirect.setFTransferBizType("InnerOrgTransfer"); + // stkTransferDirect.setFTransferBizType("InnerOrgTransfer"); /* 调拨方向:FTransferDirect (必填项)*/ - stkTransferDirect.setFTransferDirect("GENERAL"); + // stkTransferDirect.setFTransferDirect("GENERAL"); /* 调入库存组织:FStockOrgId (必填项)*/ stkTransferDirect.setFStockOrgId("101"); /* 调入货主类型:FOwnerTypeIdHead (必填项)*/ - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); + //stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); List fBillEntry=new ArrayList<>(); StkTransferDirect.FBillEntry fbe=new StkTransferDirect.FBillEntry(); /*调入批号:FDestLot*/ - fbe.setFDestLot("1234567890"); + // fbe.setFDestLot("1234567890"); /*调出批号:FLot*/ - fbe.setFLot("1234567890"); + // fbe.setFLot("1234567890"); /*基本单位:FBaseUnitId (必填项)*/ //fbe.setFBaseUnitId("liang"); /* 调入仓库:FDestStockId (必填项)*/ @@ -167,27 +170,27 @@ public class StkTransferDirect { fbe.setFMaterialId(" JX091054"); /* 调入库存状态:FDestStockStatusId (必填项)*/ - fbe.setFDestStockStatusId("KCZT01_SYS"); + // fbe.setFDestStockStatusId("KCZT01_SYS"); /* 调入货主类型:FOwnerTypeId (必填项)*/ - fbe.setFOwnerTypeId("BD_OwnerOrg"); + // fbe.setFOwnerTypeId("BD_OwnerOrg"); /* 调入货主:FOwnerId (必填项)*/ - fbe.setFOwnerId("101"); + // fbe.setFOwnerId("101"); /* 调入货主:FOwnerId (必填项)*/ - fbe.setFOwnerIdHead("101"); + // fbe.setFOwnerIdHead("101"); /* 调出保管者:FKeeperOutId (必填项)*/ - fbe.setFKeeperOutId("101"); + // fbe.setFKeeperOutId("101"); /* 调出货主:FOwnerOutId (必填项)*/ - fbe.setFOwnerOutId("101"); + // fbe.setFOwnerOutId("101"); /* 调出货主类型:FOwnerTypeOutId (必填项)*/ - fbe.setFOwnerTypeOutId("BD_OwnerOrg"); + // fbe.setFOwnerTypeOutId("BD_OwnerOrg"); /* 调出保管者类型:FKeeperTypeOutId (必填项)*/ - fbe.setFKeeperTypeOutId("BD_KeeperOrg"); + // fbe.setFKeeperTypeOutId("BD_KeeperOrg"); /* 调入保管者:FKeeperId (必填项)*/ - fbe.setFKeeperId("101"); + // fbe.setFKeeperId("101"); /* 调入保管者类型:FKeeperTypeId (必填项)*/ - fbe.setFKeeperTypeId("BD_KeeperOrg"); + // fbe.setFKeeperTypeId("BD_KeeperOrg"); /*调出库存状态:FSrcStockStatusId (必填项)*/ - fbe.setFSrcStockStatusId("KCZT01_SYS"); + // fbe.setFSrcStockStatusId("KCZT01_SYS"); /* 调出仓库:FSrcStockId (必填项)*/ fbe.setFSrcStockId("CK001"); fBillEntry.add(fbe); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 93527320ff..69b74c52df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -182,7 +182,7 @@ public class FinPaymentrecordService extends MybatisBaseService params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); + map_fEntityDetail_.put("FSaleOrgId",map_fEntityModel_.get("FSaleOrgId")); for (Map.Entry entry : params.entrySet()) { map_fEntityDetail_.put(entry.getKey(),entry.getValue()); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index f9ac9c9e4c..1bf370fb69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -15,13 +15,13 @@ "FNumber": "@KD_Flot" }, "FOwnerID": { - "FNumber": "@KD_FOwnerID" + "FNumber": "@KD_FSaleOrgId" }, "FStockID": { "FNumber": "@KD_FStockID" }, "FStockStatusID": { - "FNumber": "@KD_FStockStatusID" + "FNumber": "KCZT01_SYS" }, "FSalUnitID": { "FNumber": "liang" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java index fbf7ae00ed..dfe5c28cbc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java @@ -51,6 +51,9 @@ public class StkTransferDirectCastToKingDeeBillFields { log.info("FBillEntry_:{}",fBillEntry_); Map params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); + map_fEntityDetail_.put("FStockOutOrgId",map_fEntityModel_.get("FStockOutOrgId")); + map_fEntityDetail_.put("FStockOrgId",map_fEntityModel_.get("FStockOrgId")); + map_fEntityDetail_.put("FDate",map_fEntityModel_.get("FDate")); for (Map.Entry entry : params.entrySet()) { map_fEntityDetail_.put(entry.getKey(),entry.getValue()); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json index 1a7c30a0b8..4d5fd67466 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json @@ -6,10 +6,10 @@ "FNumber": "liang" }, "FDestLot":{ - "FNumber": "@KD_FDestLot" + "FNumber": "" }, "FLot": { - "FNumber": "@KD_FLot" + "FNumber": "" }, "FQty": 1.0, "FSrcStockId": { @@ -19,32 +19,32 @@ "FNumber": "@KD_FDestStockId" }, "FSrcStockStatusId": { - "FNumber": "@KD_FSrcStockStatusId" + "FNumber": "KCZT01_SYS" }, "FDestStockStatusId": { - "FNumber": "@KD_FDestStockStatusId" + "FNumber": "KCZT01_SYS" }, - "FBusinessDate": "2022-08-31 00:00:00", - "FOwnerTypeOutId": "@KD_FOwnerTypeOutId", + "FBusinessDate": "@KD_FDate", + "FOwnerTypeOutId": "BD_OwnerOrg", "FOwnerOutId": { - "FNumber": "@KD_FOwnerOutId" + "FNumber": "@KD_FStockOutOrgId" }, - "FOwnerTypeId": "@KD_FOwnerTypeId", + "FOwnerTypeId": "BD_OwnerOrg", "FOwnerId": { - "FNumber": "@KD_FOwnerId" + "FNumber": "@KD_FStockOrgId" }, "FBaseUnitId": { "FNumber": "liang" }, "FBaseQty": 1.0, "FISFREE": false, - "FKeeperTypeId": "@KD_FKeeperTypeId", + "FKeeperTypeId": "BD_KeeperOrg", "FKeeperId": { - "FNumber": "@KD_FKeeperId" + "FNumber": "@KD_FStockOrgId" }, - "FKeeperTypeOutId": "@KD_FKeeperTypeOutId", + "FKeeperTypeOutId": "BD_KeeperOrg", "FKeeperOutId": { - "FNumber": "@KD_FKeeperOutId" + "FNumber": "@KD_FStockOutOrgId" }, "FDestMaterialId": { "FNUMBER": " JX091054" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json index 40ee322140..bce2dbc336 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json @@ -1,42 +1,42 @@ { "FID": 0, "FBillTypeID": { - "FNUMBER": "@KD_FBillTypeID" + "FNUMBER": "ZJDB01_SYS" }, "FBizType": "NORMAL", - "FTransferDirect": "@KD_FTransferDirect", - "FTransferBizType": "@KD_FTransferBizType", + "FTransferDirect": "GENERAL", + "FTransferBizType": "调车", "FSettleOrgId": { - "FNumber": "101" + "FNumber": "" }, "FSaleOrgId": { - "FNumber": "101" + "FNumber": "" }, "FStockOutOrgId": { "FNumber": "@KD_FStockOutOrgId" }, - "FOwnerTypeOutIdHead": "@KD_FOwnerTypeOutIdHead", + "FOwnerTypeOutIdHead": "BD_OwnerOrg", "FOwnerOutIdHead": { - "FNumber": "101" + "FNumber": "" }, "FStockOrgId": { "FNumber": "@KD_FStockOrgId" }, "FIsIncludedTax": true, "FIsPriceExcludeTax": true, - "FOwnerTypeIdHead": "@KD_FOwnerTypeIdHead", + "FOwnerTypeIdHead": "BD_OwnerOrg", "FSETTLECURRID": { "FNUMBER": "PRE001" }, "FOwnerIdHead": { - "FNumber": "101" + "FNumber": "@KD_FStockOrgId" }, - "FDate": "2022-08-31 00:00:00", + "FDate": "@KD_FDate", "FBaseCurrId": { "FNumber": "PRE001" }, "FCustID": { - "FNUMBER": "GYRHHR002529" + "FNUMBER": "" }, "FBillEntry": [] } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 1b79ea7fbd..5c3ed76277 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -13,7 +13,6 @@ import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.OperVehicleState; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -89,8 +88,6 @@ public class ScmApplyInboundService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - /* APPayable apPayable=new APPayable(); - BeanUtil.copyProperties(p.getRecords().get(0),apPayable); - finKingDeeFeign.draftEntryBill(apPayable);*/ return p; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index f52ae83044..1b3bb6777a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -341,30 +341,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFTransferBizType("调车"); //调拨类型 - stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向 - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型 stkTransferDirect.setFStockOrgId("101"); //调入库存组织 - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型 - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型 stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态 - fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态 - fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型 - fBillEntry.setFKeeperOutId("101");//调出保管者 - fBillEntry.setFOwnerOutId("101");//调出货主 - fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型 - fBillEntry.setFOwnerId("101");//调入货主 - fBillEntry.setFOwnerIdHead("101");//调入货主 - fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型 - fBillEntry.setFKeeperId("101");//调入保管者 - fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型 fBillEntry.setFDestStockId("CK003");//调入仓库 fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码 fBillEntry.setFSrcStockId("CK001");//调出仓库 - fBillEntry.setFDestLot(scmVehicleEnterlibrary.getVinNo());//调入批号 - fBillEntry.setFLot(scmVehicleEnterlibrary.getVinNo());//调出批号 FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 87f03503ff..9427a7198f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -894,37 +894,18 @@ public class ScmVehicleGressionService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFTransferBizType("调车"); //调拨类型 - stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向 - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型 stkTransferDirect.setFStockOrgId("101"); //调入库存组织 - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型 - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型 stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态 - fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态 - fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型 - fBillEntry.setFKeeperOutId("101");//调出保管者 - fBillEntry.setFOwnerOutId("101");//调出货主 - fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型 - fBillEntry.setFOwnerId("101");//调入货主 - fBillEntry.setFOwnerIdHead("101");//调入货主 - fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型 - fBillEntry.setFKeeperId("101");//调入保管者 - fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型 fBillEntry.setFDestStockId("CK003");//调入仓库 fBillEntry.setFMaterialId(s);//物料编码 fBillEntry.setFSrcStockId("CK001");//调出仓库 - fBillEntry.setFLot(s); - fBillEntry.setFDestLot(s); FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); } } } - return rb.success().setData(resultBean.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); From 522a0076443053fc7d7da96e2fa32ca86ae9eca0 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 27 Sep 2022 17:31:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehiclePatrolinspectionsheetDto.java | 4 + .../ScmVehiclePatrolinspectionMapper.java | 3 - .../ScmVehiclePatrolinspectionService.java | 4 - ...cmVehiclePatrolinspectionsheetService.java | 110 +++++++----------- .../ScmVehPatrolinspectionmonthMapper.java | 4 + .../ScmVehPatrolinspectionmonthService.java | 7 +- .../ScmVehPatrolinspectionreportService.java | 19 +-- .../inspection/AppScmVehiclePatrolinVo.java | 6 + .../inspection/PatrolinspectionInfoVo.java | 6 + 9 files changed, 70 insertions(+), 93 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java index 622dd18850..a47c643987 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java @@ -68,6 +68,10 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String problems; @ApiModelProperty("处理结果") private String results; + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; @ApiModelProperty("相关责任人") private List liableList; @ApiModelProperty("经纬度") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java index 12fcc3d122..bd28a2097e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java @@ -99,9 +99,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey); - @Select("update scm_vehicle_patrolinspection set isDelete = 1 where sid = #{sid} ") - void updateBySid(@Param("sid") String sid); - @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ") void updatePatrolInspectionState(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index 6628c41b20..c72b617c98 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -272,10 +272,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService list = new ArrayList<>(); - List splitName = Arrays.asList(vo.getLiableName().split(",")); - List splitSid = Arrays.asList(vo.getLiableSid().split(",")); - for (int i = 0; i < splitName.size(); i++) { - AppLiableListVo v = new AppLiableListVo(); - v.setLiableName(splitName.get(i)); - v.setLiableSid(splitSid.get(i)); - list.add(v); - } - vo.setLiableList(list); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { for (ScmFile scmFile : scmFiles1) { @@ -233,18 +225,18 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = new ArrayList<>(); - List splitName = Arrays.asList(vo.getLiableName().split(",")); - List splitSid = Arrays.asList(vo.getLiableSid().split(",")); - for (int i = 0; i < splitName.size(); i++) { - AppLiableListVo v = new AppLiableListVo(); - v.setLiableName(splitName.get(i)); - v.setLiableSid(splitSid.get(i)); - list.add(v); - } - vo.setLiableList(list); - } +// if (StringUtils.isNotBlank(vo.getLiableName())) { +// List list = new ArrayList<>(); +// List splitName = Arrays.asList(vo.getLiableName().split(",")); +// List splitSid = Arrays.asList(vo.getLiableSid().split(",")); +// for (int i = 0; i < splitName.size(); i++) { +// AppLiableListVo v = new AppLiableListVo(); +// v.setLiableName(splitName.get(i)); +// v.setLiableSid(splitSid.get(i)); +// list.add(v); +// } +// vo.setLiableList(list); +// } List images = new ArrayList<>(); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { @@ -299,15 +291,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName()); + scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid()); scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid); scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid()); scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid); @@ -330,11 +315,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); - for (AppLiableListDto appLiableListDto : liableList) { - SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); - Integer id = sysUserVos.getId(); - receiveIdList.add(String.valueOf(id)); - } + List liableList = dto.getLiableList(); + AppLiableListDto appLiableListDto = new AppLiableListDto(); + appLiableListDto.setLiableName(dto.getLiableName()); + appLiableListDto.setLiableSid(dto.getLiableSid()); + liableList.add(appLiableListDto); + SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); appPatrolinspectionDto.setList(liableList); @@ -347,15 +335,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName()); + scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -372,11 +353,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); - for (AppLiableListDto appLiableListDto : liableList) { - SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); - Integer id = sysUserVos.getId(); - receiveIdList.add(String.valueOf(id)); - } + List liableList = dto.getLiableList(); + AppLiableListDto appLiableListDto = new AppLiableListDto(); + appLiableListDto.setLiableName(dto.getLiableName()); + appLiableListDto.setLiableSid(dto.getLiableSid()); + liableList.add(appLiableListDto); + SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); appPatrolinspectionDto.setList(liableList); @@ -589,17 +573,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - if (liableList.size() > 0) { - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); - } + patrolinspectionsheet.setDutyName(dto.getLiableName()); + patrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -624,15 +599,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + patrolinspectionsheet.setDutyName(dto.getLiableName()); + patrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java index 8e39ff4f57..fbef81e678 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java @@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -72,4 +73,7 @@ public interface ScmVehPatrolinspectionmonthMapper extends BaseMapper getCarInspectionReportList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); AppScmVehPatrolinspectionmonthInfoVo selByMainSid(String sid); + + @Update(" update scm_veh_patrolinspectionmonth set `state` = '1' where sid=#{mainSid} ") + void updateBySidState(@Param("mainSid") String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index 61699bb7a5..835c0fe93e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -187,7 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService selectListAll() { return baseMapper.selectListAll(); } + + public void updateBySidState(String mainSid) { + baseMapper.updateBySidState(mainSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java index 3e4f27e9c2..c103edbfd0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java @@ -39,6 +39,7 @@ import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; +import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService; import com.yxt.common.base.utils.JPushServer; import com.yxt.messagecenter.api.message.AppMessageDto; import com.yxt.messagecenter.api.message.MessageFeign; @@ -87,21 +88,10 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService questions1 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(dto.getMainSid(), StateKey1); @@ -183,6 +173,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService receiveIdList = new ArrayList<>(); List list = dto.getList(); for (AppLiableListDto appLiableListDto : list) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java index 09a91eaac6..51e763702e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -52,6 +52,12 @@ public class AppScmVehiclePatrolinVo implements Vo { @ApiModelProperty("相关附件") private List images = new ArrayList<>(); + @ApiModelProperty("相关责任人名称") + private String liableName; + + @ApiModelProperty("相关责任人sid") + private String liableSid; + @ApiModelProperty("相关责任人") private List liableList = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java index d70d0daf49..8488f03854 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java @@ -33,6 +33,12 @@ public class PatrolinspectionInfoVo implements Vo { @JsonProperty("result") private String results; + @ApiModelProperty("相关责任人名称") + private String liableName; + + @ApiModelProperty("相关责任人sid") + private String liableSid; + @ApiModelProperty("相关责任人") private List liableList;