From 541919942f83e22e9da2daf036259184b4d6877a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 15 Jul 2024 09:23:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8E=82=E5=AE=B6=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E5=8E=82=E5=AE=B6=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java | 8 ++++++++ .../pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java index 9efe924f4d..c2c48f2705 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java @@ -105,6 +105,14 @@ public class PmsPurchaseBillDetailsVo implements Vo { private String payTypeKey; @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") private String payTypeValue; + + @ApiModelProperty("厂家订单类型key") + private String manufacturersOrderTypeKey; + @ApiModelProperty("厂家订单类型value") + private String manufacturersOrderTypeValue; + @ApiModelProperty("厂家订单号") + private String manufacturersOrderNumber; + @ApiModelProperty("误差调整金额") private BigDecimal errorAmount; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java index 758bd012f8..a1d082ed06 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java @@ -95,6 +95,14 @@ public class PmsPurchaseBillDto implements Dto { private String payTypeKey; @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") private String payTypeValue; + + @ApiModelProperty("厂家订单类型key") + private String manufacturersOrderTypeKey; + @ApiModelProperty("厂家订单类型value") + private String manufacturersOrderTypeValue; + @ApiModelProperty("厂家订单号") + private String manufacturersOrderNumber; + @ApiModelProperty("误差调整金额") private BigDecimal errorAmount; From 7b87717e916fc86ae2972b488b856bc8a168771a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 15 Jul 2024 09:34:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java | 8 ++++++++ .../biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java | 3 +++ .../pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml | 1 + .../biz/pms/pmspurchasebill/PmsPurchaseBillService.java | 4 ++++ .../pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java | 2 ++ 5 files changed, 18 insertions(+) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java index 1c29f463cf..927e6ee28f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java @@ -91,6 +91,14 @@ public class PmsPurchaseBillRest { return rb.success().setData(sid); } + @ApiOperation("维护厂家订单号") + @PostMapping("/updateManuOrderNum") + public ResultBean updateManuOrderNum(@RequestParam("sid") String sid,@RequestParam("manufacturersOrderNumber") String manufacturersOrderNumber){ + ResultBean rb = ResultBean.fireFail(); + pmsPurchaseBillService.updateManuOrderNum(sid,manufacturersOrderNumber); + return rb.success().setData(sid); + } + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java index 9d8faa2a35..fc4aa67153 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java @@ -63,4 +63,7 @@ public interface PmsPurchaseBillMapper extends BaseMapper { int updateFlowFiled(Map map); int selectBySid(String join); + + @Update("update pms_purchase_bill set manufacturersOrderNumber = #{manufacturersOrderNumber} where sid = #{sid}") + void updateManuOrderNum(@Param("sid") String sid,@Param("manufacturersOrderNumber") String manufacturersOrderNumber); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml index 0203a5d4aa..57c23ae60a 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml @@ -15,6 +15,7 @@ ppb.`purchaseTypeValue`, ppb.`purchaseReasonValue`, ppb.`payTypeValue`, + ppb.manufacturersOrderNumber, ppb.`supplierName`, IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing, SUM(ppbd.`amount`) AS amountCount, diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 2f8d185d88..1649cd1514 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -754,4 +754,8 @@ public class PmsPurchaseBillService extends MybatisBaseService