diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 2fb90fcd..10580c68 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -24,17 +24,27 @@ import jnpf.materialvo.service.MaterialService; import jnpf.mobilePort.utils.FileCopy; import jnpf.payment.model.payment.PaymentListVO; import jnpf.payment.service.PaymentService; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchasebackEntity; +import jnpf.purchaseback.entity.Purchaseback_item0Entity; import jnpf.purchaseback.entity.PurchaseorderEntity; import jnpf.purchaseback.service.PurchasebackService; +import jnpf.purchaseback.service.Purchaseback_item0Service; import jnpf.purchaseback.service.PurchaseorderService; import jnpf.purchaseorder.entity.*; import jnpf.purchaseorder.model.purchaseorder.*; import jnpf.purchaseorder.service.*; +import jnpf.receiptin.entity.ReceiptinEntity; +import jnpf.receiptin.entity.Receiptin_item0Entity; +import jnpf.receiptin.model.receiptin.Receiptin_item0Model; +import jnpf.receiptin.service.ReceiptinService; import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.service.ReservoirareaService; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.service.SupplierService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -54,6 +64,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; import java.nio.charset.Charset; import java.text.ParseException; import java.util.ArrayList; @@ -115,6 +126,14 @@ public class PurchaseorderController { private WareHouseService wareHouseService; @Autowired private ContractFileService contractFileService; + @Autowired + private SupplierService supplierService; + @Autowired + private UserService userService; + @Autowired + private ReceiptinService receiptinService; + @Autowired + private Purchaseback_item0Service purchaseback_item0Service; /** * 归档 @@ -534,6 +553,15 @@ public class PurchaseorderController { PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id); PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); + /*SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); + if(supplierEntity != null){ + vo.setSupplierName(supplierEntity.getSupplierName()); + }*/ + + + + + if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } @@ -543,11 +571,14 @@ public class PurchaseorderController { for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){ if(StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())){ MaterialEntity materialEntity = materialService.getById(purchaseorder_item0Entity.getMaterialId()); - if(materialEntity != null && StringUtils.isNotEmpty(materialEntity.getInArea())){ - purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea()); - ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea()); - if(reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){ - purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId()); + if(materialEntity != null){ + purchaseorder_item0Entity.setMaterialName(materialEntity.getItemName()); + if(StringUtils.isNotEmpty(materialEntity.getInArea())){ + purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea()); + ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea()); + if(reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){ + purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId()); + } } } } @@ -564,6 +595,9 @@ public class PurchaseorderController { for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){ } vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class )); + if(invoicesitemList != null && invoicesitemList.size() > 0){ + vo.setInvoicesitemEntity(invoicesitemList.get(0)); + } List paymentList = paymentService.queryByPurchaseorderId(id); vo.setPaymentList(paymentList); QueryWrapper purchasebackWrapper = new QueryWrapper<>(); @@ -608,9 +642,20 @@ public class PurchaseorderController { List jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class); for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){ Map vehicleIdMap = new HashMap<>(); - jg_purchaseorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("389754644018016581","vehicle_id","ticketno",jg_purchaseorder_item0Model.getVehicleId(),vehicleIdMap)); + jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581","vehicle_id","ticketno",jg_purchaseorder_item0Model.getVehicleId(),vehicleIdMap)); Map materialIdMap = new HashMap<>(); - jg_purchaseorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_purchaseorder_item0Model.getMaterialId(),materialIdMap)); + jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533","id","item_name",jg_purchaseorder_item0Model.getMaterialId(),materialIdMap)); + PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId()); + jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate()); + + SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId()); + if(supplierEntity != null){ + jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName()); + } + UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId()); + if(userEntity != null){ + jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName()); + } } vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList); List jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id); @@ -633,10 +678,38 @@ public class PurchaseorderController { List paymentList = paymentService.queryByPurchaseorderId(id); vo.setPaymentList(paymentList); + + List receiptin_item0itemList = purchaseorderitemService.GetReceiptin_item0itemList(id); + List jg_receiptin_item0ModelList = JsonUtil.getJsonToList(receiptin_item0itemList,Receiptin_item0Model.class); + vo.setReceiptin_item0List(jg_receiptin_item0ModelList); + QueryWrapper receiptinWrapper = new QueryWrapper<>(); + receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id); + ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper); + if(receiptinEntity != null){ + vo.setReceiptamount(receiptinEntity.getReceiptamount()); + vo.setReceiptnum(receiptinEntity.getReceiptnum()); + } + /* `receiptamount` decimal(32,6) DEFAULT NULL COMMENT '入库金额', + `receiptnum` decimal(32,6) DEFAULT NULL COMMENT '入库数量',*/ + QueryWrapper purchasebackWrapper = new QueryWrapper<>(); purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id); List PurchasebackList = purchasebackService.list(purchasebackWrapper); vo.setPurchasebackList(PurchasebackList); + BigDecimal refundNum = new BigDecimal(0); + BigDecimal refundAmount = new BigDecimal(0); + List purchaseback_item0EntityList = new ArrayList<>(); + for (PurchasebackEntity purchasebackEntity: PurchasebackList) { + refundNum = refundNum.add(purchasebackEntity.getRefundNum()); + refundAmount = refundAmount.add(purchasebackEntity.getRefundAmount()); + QueryWrapper purchasebackitem0Wrapper = new QueryWrapper<>(); + purchasebackitem0Wrapper.lambda().eq(Purchaseback_item0Entity::getPurchasebackId, purchasebackEntity.getId()); + List purchaseback_item0List = purchaseback_item0Service.list(purchasebackitem0Wrapper); + purchaseback_item0EntityList.addAll(purchaseback_item0List); + } + vo.setRefundAmount(refundAmount); + vo.setRefundNum(refundNum); + vo.setPurchaseback_item0EntityList(purchaseback_item0EntityList); List jg_collectionList = purchaseorderitemService.GetCollectionitemList(id); List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class); for(CollectionitemModel jg_collectionModel : jg_collectionModelList){ @@ -652,9 +725,9 @@ public class PurchaseorderController { //添加到详情表单对象中 Map contractCodeMap = new HashMap<>(); - vo.setContractCode(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",vo.getContractCode(),contractCodeMap)); + vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",vo.getContractCode(),contractCodeMap)); Map supplierIdMap = new HashMap<>(); - vo.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",vo.getSupplierId(),supplierIdMap)); + vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",vo.getSupplierId(),supplierIdMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); return ActionResult.success(vo); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java index 2e28ba31..4dcb6599 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java @@ -57,5 +57,8 @@ public class Invoices_item0itemModel { @JsonProperty("invoiceAttachment") private String invoiceAttachment; + /** 发票附件 **/ + @JsonProperty("materialName") + private String materialName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index 536ace25..b76dac42 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -5,11 +5,14 @@ package jnpf.purchaseorder.model.purchaseorder; import jnpf.payment.model.payment.PaymentListVO; import jnpf.purchaseback.entity.PurchasebackEntity; +import jnpf.purchaseback.entity.Purchaseback_item0Entity; +import jnpf.purchaseorder.entity.InvoicesitemEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel; import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel; import jnpf.purchaseorder.model.purchaseorder.PurchasebackitemModel; import jnpf.purchaseorder.model.purchaseorder.CollectionitemModel; +import jnpf.receiptin.model.receiptin.Receiptin_item0Model; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -38,10 +41,16 @@ public class PurchaseorderInfoVO{ @JsonProperty("contractCode") private String contractCode; + /** 合同名称 **/ + @JsonProperty("contractName") + private String contractName; + /** 供应商 **/ @JsonProperty("supplierId") private String supplierId; - + /** 供应商 **/ + @JsonProperty("supplierName") + private String supplierName; /** 币种 **/ @JsonProperty("currency") private String currency; @@ -128,4 +137,31 @@ public class PurchaseorderInfoVO{ /** 子表数据 **/ @JsonProperty("collectionitemList") private List collectionitemList; + /** 子表数据 **/ + @JsonProperty("receiptin_item0List") + private List receiptin_item0List; + + /** 入库金额 **/ + @JsonProperty("receiptamount") + private BigDecimal receiptamount; + /** 入库数量 **/ + @JsonProperty("receiptnum") + private BigDecimal receiptnum; + + /** 退货重量 **/ + @JsonProperty("refundNum") + private BigDecimal refundNum; + /** 退款金额 **/ + @JsonProperty("refundAmount") + private BigDecimal refundAmount; + @JsonProperty("refundableNum") + private BigDecimal refundableNum; + @JsonProperty("refundableAmount") + private BigDecimal refundableAmount; + /** 子表数据 **/ + @JsonProperty("purchaseback_item0EntityList") + private List purchaseback_item0EntityList; + + @JsonProperty("invoicesitemEntity") + private InvoicesitemEntity invoicesitemEntity; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java index fe2e05b2..6c21f084 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java @@ -1,5 +1,6 @@ package jnpf.purchaseorder.model.purchaseorder; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -26,10 +27,23 @@ public class Purchaseorder_item0Model { @JsonProperty("vehicleId") private String vehicleId; + /** 车辆 **/ + @JsonProperty("vehicleName") + private String vehicleName; + /** 物料 **/ @JsonProperty("materialId") private String materialId; + /** 物料 **/ + @JsonProperty("materialName") + private String materialName; + + /** 磅单日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonProperty("poundDate") + private Date poundDate; + /** 磅单类型 **/ @JsonProperty("pountType") private String pountType; @@ -89,4 +103,12 @@ public class Purchaseorder_item0Model { @JsonProperty("warehouseId") private String warehouseId; + + @JsonProperty("businessName") + private String businessName; + + @JsonProperty("supplierName") + private String supplierName; + + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java index b4473883..51a8562c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java @@ -7,6 +7,7 @@ import jnpf.poundlist.entity.PoundlistEntity; import jnpf.purchaseorder.entity.*; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderDTO; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; +import jnpf.receiptin.entity.Receiptin_item0Entity; import javax.servlet.http.HttpServletResponse; import java.text.ParseException; @@ -44,6 +45,7 @@ public interface PurchaseorderitemService extends IService GetPurchaseorder_item0List(String id); List GetInvoices_item0itemList(String id); + List GetReceiptin_item0itemList(String id); List GetPaymentitemList(String id); List GetPurchasebackitemList(String id); List GetCollectionitemList(String id); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index b06f7b11..530993c0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -46,6 +46,10 @@ import jnpf.purchaseorder.mapper.PurchaseorderitemMapper; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderDTO; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; import jnpf.purchaseorder.service.*; +import jnpf.receiptin.entity.ReceiptinEntity; +import jnpf.receiptin.entity.Receiptin_item0Entity; +import jnpf.receiptin.service.ReceiptinService; +import jnpf.receiptin.service.Receiptin_item0Service; import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.saleorder.mapper.SaleorderitemMapper; import jnpf.supplyProcessAnalysis.entity.ContractMEntity; @@ -147,6 +151,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl> list ,String templateFilePath) throws Exception{ //声明要创建的文件名 @@ -414,7 +422,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl0){ return invoices_item0itemService.list(queryWrapper); } + @Override + public List GetReceiptin_item0itemList(String id){ + QueryWrapper receiptinQueryWrapper = new QueryWrapper<>(); + receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getSouceno, id); + ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinQueryWrapper); + List list = new ArrayList<>(); + //查询入库信息 + if(receiptinEntity != null){ + list = receiptin_item0Service.queryByReceiptinId(receiptinEntity.getId()); + } + return list; + } + @Override public List GetPaymentitemList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java index 9ef80010..a6e2c6f8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java @@ -119,4 +119,13 @@ public class Receiptin_item0Entity { @TableField("material_id") private String materialId; + @TableField(exist = false) + private String vehicleName; + @TableField(exist = false) + private String materialName1; + @TableField(exist = false) + private String warehouseName; + @TableField(exist = false) + private String reservoirareaName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java index f5b6d29b..024f9f15 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java @@ -4,6 +4,8 @@ package jnpf.receiptin.mapper; import jnpf.receiptin.entity.Receiptin_item0Entity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * * jg_receiptin_item0 @@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface Receiptin_item0Mapper extends BaseMapper { + List queryByReceiptinId(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java index a45baff7..2f55c4f1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java @@ -1,6 +1,7 @@ package jnpf.receiptin.model.receiptin; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -69,6 +70,11 @@ public class Receiptin_item0Model { @JsonProperty("batchno") private String batchno; + /** 磅单日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; + // /** 磅单类型 **/ // @JsonProperty("lastModifyUserId") // private String lastModifyUserId; @@ -82,4 +88,13 @@ public class Receiptin_item0Model { @JsonProperty("materialId") private String materialId; + @JsonProperty("vehicleName") + private String vehicleName; + @JsonProperty("materialName1") + private String materialName1; + @JsonProperty("warehouseName") + private String warehouseName; + @JsonProperty("reservoirareaName") + private String reservoirareaName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java index 7fa45ac6..3a7b2eec 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java @@ -2,6 +2,9 @@ package jnpf.receiptin.service; import jnpf.receiptin.entity.Receiptin_item0Entity; import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + /** * * jg_receiptin_item0 @@ -12,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface Receiptin_item0Service extends IService { + List queryByReceiptinId(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java index 0de41731..95f49c44 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java @@ -36,6 +36,11 @@ import java.util.*; */ @Service public class Receiptin_item0ServiceImpl extends ServiceImpl implements Receiptin_item0Service{ + @Autowired + private Receiptin_item0Mapper receiptin_item0Mapper; - + @Override + public List queryByReceiptinId(String id) { + return receiptin_item0Mapper.queryByReceiptinId(id); + } } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/Receiptin_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/Receiptin_item0Mapper.xml deleted file mode 100644 index ae158538..00000000 --- a/SC-boot/linkage-scm/src/main/resources/Receiptin_item0Mapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/ReceiptinMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml similarity index 100% rename from SC-boot/linkage-scm/src/main/resources/ReceiptinMapper.xml rename to SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml new file mode 100644 index 00000000..26a31a5a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml @@ -0,0 +1,13 @@ + + + + +