diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index e374661c4c..2cc774f8f7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbusrepairbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -149,5 +150,16 @@ public class AsBusrepairBill extends BaseEntity { private String dockingPhone; @ApiModelProperty("是否确认材料费（1是，0否）") private Integer materialConfirm; - + @ApiModelProperty("派工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date dispatchTime; + @ApiModelProperty("竣工时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date finishTime; + @ApiModelProperty("结算时间") + private String settleTime; + @ApiModelProperty("索赔类型key") + private String shClaimTypeKey; + @ApiModelProperty("索赔类型value") + private String shClaimTypeValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java index 64fda0c888..7e4f830e65 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java @@ -27,5 +27,12 @@ public class AsBusrepairBillAitem extends BaseEntity { private BigDecimal price; @ApiModelProperty("销售价常量") private BigDecimal aitemPrice; - + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java new file mode 100644 index 0000000000..42ed79afe8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.as.api.asbusrepairbillaitemspec; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/17 14:56 + */ +@Data +@ApiModel(value = "维修工单-固定附加项目", description = "维修工单-固定附加项目") +@TableName("as_busrepair_bill_aitemspec") +public class AsBusrepairBillAitemspec extends BaseEntity { + @ApiModelProperty("工单sid") + private String billSid; + @ApiModelProperty("附加项目sid") + private String attachItemSid; + @ApiModelProperty("项目名称") + private String attachItem; + @ApiModelProperty("项目费用") + private BigDecimal price; + @ApiModelProperty("开票价") + private BigDecimal taxPrice; + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java index 5cf06cc6d3..b6a105c47f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java @@ -48,6 +48,13 @@ public class AsBusrepairBillSitem extends BaseEntity { private BigDecimal amount; @ApiModelProperty("销售价格常量") private BigDecimal sitemPrice; - + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java index 6ca8d91ad1..3cdb4db5c6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -108,4 +108,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { private BigDecimal cost; @ApiModelProperty("成本合计") private BigDecimal costTotal; + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java new file mode 100644 index 0000000000..c1ea9be632 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBusrepairBillAitemspecMapper extends BaseMapper { + + @Select("select * from as_busrepair_bill_aitemspec where billSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_busrepair_bill_aitemspec where billSid = #{sid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml new file mode 100644 index 0000000000..083f65958c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java new file mode 100644 index 0000000000..fd8eff6fb4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBusrepairBillAitem") +public class AsBusrepairBillAitemspecRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java new file mode 100644 index 0000000000..25cec461b5 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbusrepairbillaitemspec; + +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBusrepairBillAitemspecService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} 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 ac222282ef..1aec4e3d90 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 @@ -21,6 +21,12 @@ public class BaseGoodsSpuRest { BaseGoodsSpuService baseGoodsSpuService; + @ApiOperation("根据sid查询商品") + @GetMapping("/fetchEntityBySid") + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid) { + return baseGoodsSpuService.fetchEntityBySid(sid); + } + @ApiOperation("商品管理分页列表") @PostMapping("/goodsListPage") public ResultBean> goodsListPage(@RequestBody PagerQuery pq) { 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 0fb1b5061f..d9cfff3f47 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 @@ -554,4 +554,13 @@ public class BaseGoodsSpuService extends MybatisBaseService fetchEntityBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseGoodsSpu baseGoodsSpu = fetchBySid(sid); + if (baseGoodsSpu != null) { + return rb.success().setData(baseGoodsSpu); + } + return rb; + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index 41e582004a..c3f3152557 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -40,8 +40,6 @@ public class SalesGoodsVo { @ApiModelProperty("库存数量") private String currentCount; - @ApiModelProperty("厂家") - private String supplierName; @ApiModelProperty("商品ID") private String goodsID; // 商品ID @@ -63,6 +61,10 @@ public class SalesGoodsVo { private String billObjSid; //供应商 private String billObjName; + //供应商sid + private String supplierSid; + //供应商 + private String supplierName; //销售价常量 private String goodsDetailsPrice; //是否含税（0含税，1不含税） diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java index 967ed27409..602b2a1be1 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java @@ -106,4 +106,6 @@ public class SmsSalesBill extends BaseEntity { private BigDecimal goodsAmount; @ApiModelProperty("附加费") private BigDecimal addAmount; + @ApiModelProperty("结算时间") + private String settleTime; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java index 2b5063c106..590f038d10 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java @@ -241,6 +241,14 @@ public class SmsSalesBillService extends MybatisBaseService goodsSpuResultBean = baseGoodsSpuFeign.fetchEntityBySid(recordDto.getGoodsSpuSid()); + if (goodsSpuResultBean.getSuccess()) { + BaseGoodsSpu goodsSpu = goodsSpuResultBean.getData(); + if (StringUtils.isNotBlank(goodsSpu.getManufacturerName())) { + recordDto.setManufacturerName(goodsSpu.getManufacturerName()); + } + if (StringUtils.isNotBlank(goodsSpu.getManufacturerSid())) { + recordDto.setManufacturerSid(goodsSpu.getManufacturerSid()); + } + } wmsInventoryRecordService.saveRecord(recordDto); } List vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java new file mode 100644 index 0000000000..9f3ab52c19 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java @@ -0,0 +1,33 @@ +package com.yxt.wms.feign.base.basegoodspu; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class BaseGoodsSpu extends BaseEntity { + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//副标题 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String brandSid;//品牌sid + private String manufacturerSid;//厂家sid + private String manufacturerName;//厂家名称 + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private Integer shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java index 81f2345edc..5ac113f4fd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; /** @@ -24,4 +25,8 @@ public interface BaseGoodsSpuFeign { @ApiOperation("查询商品是否为一品一码") @GetMapping("/selIsGoodsID/{sid}") public ResultBean selIsGoodsID(@PathVariable("sid") String sid); + + @ApiOperation("根据sid查询商品") + @GetMapping("/fetchEntityBySid") + public ResultBean fetchEntityBySid(@RequestParam("sid") String sid); }