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 1d83e0243c..e16f876f16 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 @@ -570,7 +570,7 @@ public class BaseAccadjApplyService extends MybatisBaseService fInStockEntry = new ArrayList<>(); List scmApplyInboundVehQuerys = new ArrayList<>(); @@ -709,8 +709,6 @@ public class BaseAccadjApplyService extends MybatisBaseService fEntity = new ArrayList<>(); for (BaseVehicle baseVehicle : baseVehicles) { //销售出库单物料信息 diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index e9e1cf8c8c..81e3363b8c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.crmMaintenanceenterpriseRecord","com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply","com.yxt.anrui.terminal.fegin.wmsotheroutapply","com.yxt.anrui.terminal.fegin.oaleaveapply","com.yxt.anrui.terminal.fegin.oamendapply","com.yxt.anrui.terminal.fegin.wmsgoodstag","com.yxt.anrui.terminal.fegin.wmsinitialdetail"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply","com.yxt.anrui.terminal.fegin.wmsotheroutapply","com.yxt.anrui.terminal.fegin.oaleaveapply","com.yxt.anrui.terminal.fegin.oamendapply","com.yxt.anrui.terminal.fegin.wmsgoodstag","com.yxt.anrui.terminal.fegin.wmsinitialdetail","com.yxt.anrui.terminal.fegin.smsgoods","com.yxt.anrui.terminal.fegin.crmMaintenanceenterpriseRecord"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index d27e82fc1c..a47c9567c7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -235,17 +235,17 @@ public class AppFirstShelvesService { smsGoodsDto.setSupplierName(wmsInitialDetail.getSupplierName()); smsGoodsDto.setUnit(wmsGoodsTag.getUnit()); smsGoodsDto.setCost(wmsInitialDetail.getInCost().toString()); - BigDecimal saleGuidePrice = wmsInitialDetail.getSaleGuidePrice(); + BigDecimal inCost = wmsInitialDetail.getInCost(); SmsPricestrategyBillDetailDetailsVo data = smsPricestrategyBillFeign.selByGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()).getData(); if (data == null) { - smsGoodsDto.setPrice(saleGuidePrice.toString()); + smsGoodsDto.setPrice(inCost.toString()); } else { List smsPricestrategyBillGoodstypedetailDetailsVos = data.getSmsPricestrategyBillGoodstypedetailList(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { - if (saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { + if (inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); - saleGuidePrice = saleGuidePrice.add(saleGuidePrice.multiply(markupRate).divide(new BigDecimal("100"))); - smsGoodsDto.setPrice(saleGuidePrice.toString()); + inCost = inCost.add(inCost.multiply(markupRate).divide(new BigDecimal("100"))); + smsGoodsDto.setPrice(inCost.toString()); } } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java index a774d47bbd..78e8af1e65 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java @@ -99,6 +99,12 @@ public class BaseGoodsSpuRest { return baseGoodsSpuService.selIsGoodsID(sid); } + @ApiOperation("根据商品类型sid查询商品类型名称") + @GetMapping("/selGoodsTypeBySid") + public ResultBean selGoodsTypeBySid(@RequestParam("sid") String sid){ + return baseGoodsSpuService.selGoodsTypeBySid(sid); + } + @ApiOperation("根据图号和部门查询商品信息是否存在") @GetMapping("/selByCodeAndDept") ResultBean selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){ diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java index 2d2e8a1384..8d9164857b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java @@ -30,4 +30,6 @@ public interface BaseGoodsSpuMapper extends BaseMapper { int selByCodeAndDept(@Param("code") String code,@Param("deptSid") String deptSid); List selPurchaseAssetInfo(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + + String selGoodsTypeBySid(@Param("sid") String sid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 37474ed1b5..812f811723 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -109,4 +109,7 @@ WHERE and goodsCode like concat('%',#{name},'%') + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index fa88df44f4..2332242bcf 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -633,4 +633,10 @@ public class BaseGoodsSpuService extends MybatisBaseService selGoodsTypeBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + String typeName = baseMapper.selGoodsTypeBySid(sid); + return rb.success().setData(typeName); + } } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java index 07d9ea82b4..ee46f7a021 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -327,6 +327,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid()); List smsGoods = smsGoodsService.selByGoodsTypeSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid()); for (SmsGoods smsGood : smsGoods) { - BigDecimal price = smsGood.getPrice(); + BigDecimal cost = smsGood.getCost(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { - if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { + if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); - price = price.add(price.multiply(markupRate).divide(new BigDecimal("100"))); - smsGoodsService.updateSalesPrice(smsGood.getSid(), price.toString()); + cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); + smsGoodsService.updateSalesPrice(smsGood.getSid(), cost.toString()); } } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml index d1e84539e6..e255549395 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml @@ -14,5 +14,7 @@ WHERE sd.goodsTypeSid = #{goodsTypeSid} AND sb.deptSid = #{deptSid} AND sb.nodeState = '已办结' + ORDER BY sb.createTime DESC + LIMIT 1 \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index bc4b08edb2..28d74967ef 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -853,13 +853,15 @@ public class WmsShelfBillService extends MybatisBaseService data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) { - cost = receiptBillDetail.getCost(); if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); @@ -873,8 +875,13 @@ public class WmsShelfBillService extends MybatisBaseService selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid); + + @ApiOperation("根据商品类型sid查询商品类型名称") + @GetMapping("/selGoodsTypeBySid") + public ResultBean selGoodsTypeBySid(@RequestParam("sid") String sid); + }