From f1362c02a2fd7cb61bc724f564b5374bde2ec803 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 6 Jun 2023 16:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E7=A7=BB=E4=BA=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=B0=E4=B8=9A=E5=8A=A1=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusRecordsInvoiceVo.java | 4 +- .../BusTransferRecordEnum.java | 4 +- .../BusTransferRecords.java | 4 +- .../BusTransferRecordsDto.java | 4 +- .../BusTransferRecordsFeign.java | 20 +++--- .../BusTransferRecordsFeignFallback.java | 4 +- .../BusTransferRecordsQuery.java | 4 +- .../BusTransferRecordsVo.java | 4 +- .../BusDeliveredApplyService.java | 2 +- .../BusHandoverPrepareService.java | 25 +++---- .../BusTransferRecordsMapper.java | 12 ++-- .../BusTransferRecordsMapper.xml | 6 +- .../BusTransferRecordsRest.java | 46 ++++++++++++ .../BusTransferRecordsService.java | 72 +++++++++---------- .../ScmTransferRecordsRest.java | 46 ------------ doc/databases/bus-center_tables.sql | 46 ++++++++++++ doc/databases/scm_tables.sql | 44 +----------- 17 files changed, 174 insertions(+), 173 deletions(-) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java (90%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java (83%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java (95%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java (94%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java (64%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java (59%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java (91%) rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java => anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java (91%) rename anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java => anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java (50%) rename anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml => anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml (66%) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java rename anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java => anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java (69%) delete mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java similarity index 90% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java index ae421f94c4..f08566c615 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.vo.Vo; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; * @date: 2023/6/5 **/ @Data -public class ScmRecordsInvoiceVo implements Vo { +public class BusRecordsInvoiceVo implements Vo { private static final long serialVersionUID = 5607692895870869172L; private String vinSid; //车架号 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java similarity index 83% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java index 7c6a6fcf2e..769c616bc7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordEnum.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; /** * @description: 物品移交类型 * @author: dimengzhe * @date: 2023/6/5 **/ -public enum ScmTransferRecordEnum { +public enum BusTransferRecordEnum { FP("01", "发票"), diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java similarity index 95% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java index 066a34d533..93d09bd6ce 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecords.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.Date; * @date: 2023/6/5 **/ @Data -public class ScmTransferRecords extends BaseEntity { +public class BusTransferRecords extends BaseEntity { private static final long serialVersionUID = 9087540680738846795L; @ApiModelProperty("移交物品sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java similarity index 94% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java index 479cb78ac5..b1a5774ad8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +12,7 @@ import java.util.List; * @date: 2023/6/5 **/ @Data -public class ScmTransferRecordsDto implements Dto { +public class BusTransferRecordsDto implements Dto { private static final long serialVersionUID = 4444291069272893613L; @ApiModelProperty("合同编号") private String contractNo; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java similarity index 64% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java index a665c86dd0..4a2c260afb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -18,25 +18,25 @@ import org.springframework.web.bind.annotation.RequestParam; **/ @Api(tags = "物品移交记录") @FeignClient( - contextId = "anrui-scm-ScmTransferRecords", - name = "anrui-scm", - path = "v1/ScmTransferRecords", - fallback = ScmTransferRecordsFeignFallback.class) -public interface ScmTransferRecordsFeign { + contextId = "anrui-buscenter-BusTransferRecords", + name = "anrui-buscenter", + path = "v1/BusTransferRecords", + fallback = BusTransferRecordsFeignFallback.class) +public interface BusTransferRecordsFeign { @ApiOperation("分页列表") @PostMapping("/pagerList") - public ResultBean> pagerList(@RequestBody PagerQuery pq); + public ResultBean> pagerList(@RequestBody PagerQuery pq); @ApiOperation("新增") @PostMapping("/saveRecords") - ResultBean saveRecords(@RequestBody ScmTransferRecordsDto dto); + ResultBean saveRecords(@RequestBody BusTransferRecordsDto dto); @ApiOperation("发票接收确认初始化") @GetMapping("/getInvoiceInfo") - ResultBean getInvoiceInfo(@RequestParam("sid") String sid); + ResultBean getInvoiceInfo(@RequestParam("sid") String sid); @ApiOperation("根据接收人sid以及车辆sid查询是否有待接收记录") @GetMapping("/selectByVinSid") - ResultBean selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid); + ResultBean selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java similarity index 59% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java index d534958933..67347a3b8e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeignFallback.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import org.springframework.stereotype.Component; @@ -8,5 +8,5 @@ import org.springframework.stereotype.Component; * @date: 2023/6/5 **/ @Component -public class ScmTransferRecordsFeignFallback { +public class BusTransferRecordsFeignFallback { } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java similarity index 91% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java index ad5f2b6c37..713d50e15f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2023/6/5 **/ @Data -public class ScmTransferRecordsQuery implements Query { +public class BusTransferRecordsQuery implements Query { private static final long serialVersionUID = 1398412884121486811L; private String menuUrl; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java similarity index 91% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java index 51c2f43fc7..4d78a8107c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.scm.api.scmtransferrecords; +package com.yxt.anrui.buscenter.api.bustransferrecords; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date: 2023/6/5 **/ @Data -public class ScmTransferRecordsVo implements Vo { +public class BusTransferRecordsVo implements Vo { private static final long serialVersionUID = -2648064038807719461L; @ApiModelProperty("合同编号") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 564168f6a2..5bdb808842 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -675,7 +675,7 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); List detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 06b8e55024..0b8506257e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -44,10 +44,12 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepa import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo; import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService; import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService; +import com.yxt.anrui.buscenter.biz.bustransferrecords.BusTransferRecordsService; import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService; import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; @@ -56,8 +58,6 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -111,7 +111,7 @@ public class BusHandoverPrepareService extends MybatisBaseService createQueryWrapper(BusHandoverPrepareQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -169,16 +169,16 @@ public class BusHandoverPrepareService extends MybatisBaseService handoverPrepareVehicleDtos = dto.getAppBusHandoverPrepareVehicleDtos(); if (handoverPrepareVehicleDtos.size() > 0) { for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) { BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle(); - BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle); + BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle,"sid"); busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid()); - busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle); + busHandoverPrepareVehicleService.insert(busHandoverPrepareVehicle); } } - save(busHandoverPrepare); } /** @@ -199,7 +199,6 @@ public class BusHandoverPrepareService extends MybatisBaseService qw = new QueryWrapper<>(); //======================= - params.setMenuSid("ace04aa4-c970-4960-b211-984052f204c3"); PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(params.getOrgPath()); privilegeQuery.setMenuSid(params.getMenuSid()); @@ -234,15 +233,13 @@ public class BusHandoverPrepareService extends MybatisBaseService p = new PagerVo<>(); - return p; + /* PagerVo p = new PagerVo<>(); + return p;*/ + qw.eq("createBySid", params.getUserSid()); } if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备 qw.eq("handoverPrepareStateKey", params.getType()); } - /* if (StringUtils.isNotBlank(useOrgSid)) { - qw.eq("useOrgSid", useOrgSid); - }*/ if (StringUtils.isNotBlank(params.getContractNo())) { qw.like("contractNo", params.getContractNo()); } @@ -315,8 +312,8 @@ public class BusHandoverPrepareService extends MybatisBaseService scmTransferRecordsResultBean = scmTransferRecordsFeign.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid); - if (scmTransferRecordsResultBean.getData() == null) { + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid); + if (busTransferRecordsResultBean.getData() == null) { return rb.setMsg("发票未准备好"); } AppInvoicingInfoVo vo = new AppInvoicingInfoVo(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java similarity index 50% rename from anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java rename to anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java index 5349c5d44b..6db6cac78e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.scm.biz.scmtransferrecords; +package com.yxt.anrui.buscenter.biz.bustransferrecords; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,8 +15,8 @@ import org.apache.ibatis.annotations.Param; * @date: 2023/6/5 **/ @Mapper -public interface ScmTransferRecordsMapper extends BaseMapper { - IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); +public interface BusTransferRecordsMapper extends BaseMapper { + IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); - ScmTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid); + BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml similarity index 66% rename from anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml rename to anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml index afc739782c..8e8575076e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml @@ -1,7 +1,7 @@ - - select sid, contractNo, vinNo, @@ -16,7 +16,7 @@ - select * from scm_transfer_records where vinSid = #{vinSid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java new file mode 100644 index 0000000000..6bd2330d7f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.buscenter.biz.bustransferrecords; + +import com.yxt.anrui.buscenter.api.bustransferrecords.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 物品移交记录 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Api(tags = "物品移交记录") +@RestController +@RequestMapping("v1/BusTransferRecords") +public class BusTransferRecordsRest implements BusTransferRecordsFeign { + + @Autowired + private BusTransferRecordsService busTransferRecordsService; + + @Override + public ResultBean> pagerList(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busTransferRecordsService.pagerList(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveRecords(BusTransferRecordsDto dto) { + return busTransferRecordsService.saveRecords(dto); + } + + @Override + public ResultBean getInvoiceInfo(String sid) { + return busTransferRecordsService.getInvoiceInfo(sid); + } + + @Override + public ResultBean selectByVinSid(String vinSid, String receiveUserSid) { + return busTransferRecordsService.selectByVinSid(vinSid, receiveUserSid); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java similarity index 69% rename from anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java rename to anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 6f14adef0e..266a64d9bb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -1,12 +1,12 @@ -package com.yxt.anrui.scm.biz.scmtransferrecords; +package com.yxt.anrui.buscenter.biz.bustransferrecords; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bustransferrecords.*; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.scm.api.scmtransferrecords.*; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * @date: 2023/6/5 **/ @Service -public class ScmTransferRecordsService extends MybatisBaseService { +public class BusTransferRecordsService extends MybatisBaseService { @Autowired private FinVehicleInvoiceFeign finVehicleInvoiceFeign; @@ -36,9 +36,9 @@ public class ScmTransferRecordsService extends MybatisBaseService pagerList(PagerQuery pq) { - QueryWrapper qw = new QueryWrapper<>(); - ScmTransferRecordsQuery pagerQuery = pq.getParams(); + public PagerVo pagerList(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + BusTransferRecordsQuery pagerQuery = pq.getParams(); if (pagerQuery != null) { if (pagerQuery.getType() == 0) { qw.eq("receiveState", 0); @@ -49,7 +49,7 @@ public class ScmTransferRecordsService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.pagerList(page, qw); - for (ScmTransferRecordsVo record : pagging.getRecords()) { + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.pagerList(page, qw); + for (BusTransferRecordsVo record : pagging.getRecords()) { String vinSid = record.getVinSid(); //根据合同编号和车辆sid查询开票相关 ResultBean resultBean = finVehicleInvoiceFeign.selectByVinSids(vinSid); @@ -95,47 +95,47 @@ public class ScmTransferRecordsService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveRecords(ScmTransferRecordsDto dto) { + public ResultBean saveRecords(BusTransferRecordsDto dto) { ResultBean rb = ResultBean.fireFail(); - ScmTransferRecords scmTransferRecords = new ScmTransferRecords(); - BeanUtil.copyProperties(dto, scmTransferRecords); - scmTransferRecords.setReceiveState(0); - scmTransferRecords.setCreateBySid(dto.getTransferSid()); - baseMapper.insert(scmTransferRecords); + BusTransferRecords BusTransferRecords = new BusTransferRecords(); + BeanUtil.copyProperties(dto, BusTransferRecords); + BusTransferRecords.setReceiveState(0); + BusTransferRecords.setCreateBySid(dto.getTransferSid()); + baseMapper.insert(BusTransferRecords); return rb.success(); } - public ResultBean getInvoiceInfo(String sid) { - ResultBean rb = ResultBean.fireFail(); - ScmRecordsInvoiceVo scmRecordsInvoiceVo = new ScmRecordsInvoiceVo(); - ScmTransferRecords scmTransferRecords = fetchBySid(sid); - BeanUtil.copyProperties(scmTransferRecords, scmRecordsInvoiceVo); - ResultBean resultBean = finVehicleInvoiceFeign.selectByVinSids(scmTransferRecords.getVinSid()); + public ResultBean getInvoiceInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusRecordsInvoiceVo BusRecordsInvoiceVo = new BusRecordsInvoiceVo(); + BusTransferRecords BusTransferRecords = fetchBySid(sid); + BeanUtil.copyProperties(BusTransferRecords, BusRecordsInvoiceVo); + ResultBean resultBean = finVehicleInvoiceFeign.selectByVinSids(BusTransferRecords.getVinSid()); if (resultBean.getData() != null) { FinVehicleInvoice finVehicleInvoice = resultBean.getData(); - scmRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo()); - scmRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString()); - scmRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle()); - scmRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType()); + BusRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo()); + BusRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString()); + BusRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle()); + BusRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType()); if (StringUtils.isNotBlank(finVehicleInvoice.getFilePath())) { List filePathList = Arrays.asList(finVehicleInvoice.getFilePath().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - scmRecordsInvoiceVo.setFilePathList(filePathList); + BusRecordsInvoiceVo.setFilePathList(filePathList); } } - if (StringUtils.isNotBlank(scmTransferRecords.getReceiveFiles())) { - List receiveFileList = Arrays.asList(scmTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - scmRecordsInvoiceVo.setReceiveFilesList(receiveFileList); + if (StringUtils.isNotBlank(BusTransferRecords.getReceiveFiles())) { + List receiveFileList = Arrays.asList(BusTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); + BusRecordsInvoiceVo.setReceiveFilesList(receiveFileList); } - return rb.success().setData(scmRecordsInvoiceVo); + return rb.success().setData(BusRecordsInvoiceVo); } - public ResultBean selectByVinSid(String vinSid, String receiveUserSid) { - ResultBean rb = ResultBean.fireFail(); - ScmTransferRecords scmTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid); - return rb.success().setData(scmTransferRecords); + public ResultBean selectByVinSid(String vinSid, String receiveUserSid) { + ResultBean rb = ResultBean.fireFail(); + BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid); + return rb.success().setData(BusTransferRecords); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java deleted file mode 100644 index 361f5643af..0000000000 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.anrui.scm.biz.scmtransferrecords; - -import com.yxt.anrui.scm.api.scmtransferrecords.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @description: 物品移交记录 - * @author: dimengzhe - * @date: 2023/6/5 - **/ -@Api(tags = "物品移交记录") -@RestController -@RequestMapping("v1/ScmTransferRecords") -public class ScmTransferRecordsRest implements ScmTransferRecordsFeign { - - @Autowired - private ScmTransferRecordsService scmTransferRecordsService; - - @Override - public ResultBean> pagerList(PagerQuery pq) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = scmTransferRecordsService.pagerList(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean saveRecords(ScmTransferRecordsDto dto) { - return scmTransferRecordsService.saveRecords(dto); - } - - @Override - public ResultBean getInvoiceInfo(String sid) { - return scmTransferRecordsService.getInvoiceInfo(sid); - } - - @Override - public ResultBean selectByVinSid(String vinSid, String receiveUserSid) { - return scmTransferRecordsService.selectByVinSid(vinSid, receiveUserSid); - } -} diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index 6a90c8fbea..e7ee125d25 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -863,3 +863,49 @@ CREATE TABLE `bus_arrears_carry_vehicle_details` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='欠款提车车辆信息'; + + +DROP TABLE IF EXISTS `bus_transfer_records`; +CREATE TABLE `bus_transfer_records` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `goodsSid` varchar(64) DEFAULT NULL COMMENT '移交物品sid', + `goodsName` varchar(64) DEFAULT NULL COMMENT '移交物品名称', + `goodsType` varchar(64) DEFAULT NULL COMMENT '移交物品类别', + `goodsTypeKey` varchar(64) DEFAULT NULL COMMENT '移交物品类别Key', + `contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号', + `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', + `vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', + `transferNum` int(32) DEFAULT NULL COMMENT '移交数量', + `goodsUnit` varchar(200) DEFAULT NULL COMMENT '物品单位', + `transferSid` varchar(64) DEFAULT NULL COMMENT '移交人sid', + `transferName` varchar(64) DEFAULT NULL COMMENT '移交人', + `transferDeptSid` varchar(64) DEFAULT NULL COMMENT '移交部门sid', + `transferDept` varchar(64) DEFAULT NULL COMMENT '移交部门', + `transferRemarks` text DEFAULT NULL COMMENT '移交备注', + `transferFiles` text DEFAULT NULL COMMENT '移交附件', + `receiveRoleSid` varchar(64) DEFAULT NULL COMMENT '接收角色sid', + `receiveSid` varchar(64) DEFAULT NULL COMMENT '接收人sid', + `receiveName` varchar(64) DEFAULT NULL COMMENT '接收人', + `receiveDeptSid` varchar(64) DEFAULT NULL COMMENT '接收部门sid', + `receiveDept` varchar(64) DEFAULT NULL COMMENT '接收部门', + `receiveState` int(32) DEFAULT NULL COMMENT '接收状态：0待接收，1已接收', + `receiveTime` timestamp null DEFAULT NULL COMMENT '接收时间', + `receiveFiles` text DEFAULT NULL COMMENT '接收附件', + `useOrgSid` varchar(255) DEFAULT NULL COMMENT '使用组织sid', + `useOrgName` varchar(255) DEFAULT NULL COMMENT '使用组织名称', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='物品移交记录表'; + diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index 24a57553b6..abf2c59cc3 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -933,48 +933,6 @@ CREATE TABLE `scm_vehicle_gression_veh` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='移位申请单车架号库'; -DROP TABLE IF EXISTS `scm_transfer_records`; -CREATE TABLE `scm_transfer_records` -( - `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', - `sid` varchar(64) NOT NULL COMMENT 'sid', - `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', - `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', - `state` int(32) DEFAULT '1' COMMENT '状态', - `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', - `remarks` varchar(255) DEFAULT NULL COMMENT '备注', - `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', - `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', - `goodsSid` varchar(64) DEFAULT NULL COMMENT '移交物品sid', - `goodsName` varchar(64) DEFAULT NULL COMMENT '移交物品名称', - `goodsType` varchar(64) DEFAULT NULL COMMENT '移交物品类别', - `goodsTypeKey` varchar(64) DEFAULT NULL COMMENT '移交物品类别Key', - `contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号', - `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', - `vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', - `transferNum` int(32) DEFAULT NULL COMMENT '移交数量', - `goodsUnit` varchar(200) DEFAULT NULL COMMENT '物品单位', - `transferSid` varchar(64) DEFAULT NULL COMMENT '移交人sid', - `transferName` varchar(64) DEFAULT NULL COMMENT '移交人', - `transferDeptSid` varchar(64) DEFAULT NULL COMMENT '移交部门sid', - `transferDept` varchar(64) DEFAULT NULL COMMENT '移交部门', - `transferRemarks` text DEFAULT NULL COMMENT '移交备注', - `transferFiles` text DEFAULT NULL COMMENT '移交附件', - `receiveRoleSid` varchar(64) DEFAULT NULL COMMENT '接收角色sid', - `receiveSid` varchar(64) DEFAULT NULL COMMENT '接收人sid', - `receiveName` varchar(64) DEFAULT NULL COMMENT '接收人', - `receiveDeptSid` varchar(64) DEFAULT NULL COMMENT '接收部门sid', - `receiveDept` varchar(64) DEFAULT NULL COMMENT '接收部门', - `receiveState` int(32) DEFAULT NULL COMMENT '接收状态：0待接收，1已接收', - `receiveTime` timestamp null DEFAULT NULL COMMENT '接收时间', - `receiveFiles` text DEFAULT NULL COMMENT '接收附件', - `useOrgSid` varchar(255) DEFAULT NULL COMMENT '使用组织sid', - `useOrgName` varchar(255) DEFAULT NULL COMMENT '使用组织名称', - PRIMARY KEY (`id`), - KEY `id` (`id`) -) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='物品移交记录表'; +