diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue index fa0acac276..1f6dbfab51 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue @@ -128,7 +128,7 @@
开户行
- + diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 5a0e9162ce..86096da79b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -330,7 +330,7 @@
二次上传金额
- + @@ -338,11 +338,11 @@
其中待支付费用
- +
其中抵顶费用
- +
其中含返利
@@ -674,6 +674,26 @@ export default { } this.init() }, + getSpecialNumber(val, limit) { + val = val.replace(/[^0-9.-]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点 + val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 val = val.replace(/^00/, '0.') // 开头不能有两个0 @@ -727,10 +747,10 @@ export default { // 二次调整页面--返利二次上传模块 secondCostInput() { // 二次上传金额 > 0 时，返利二次上传为勾选状态 - if (parseFloat(this.formobj.secondaryUploadMoney) > 0) { - this.checked = true - } else { + if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') { this.checked = false + } else { + this.checked = true } // 其中含返利 = 二次上传金额 - 其中待支付费用 - 其中抵顶费用 this.formobj.secondRebate = Math.round((parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) - parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) * 100) / 100 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue index 5e6c69d05d..9fdcd5ac51 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue @@ -126,11 +126,11 @@
其中待支付费用
- +
其中抵顶费用
- +
抵顶费用说明
@@ -145,7 +145,7 @@
上传金额
- + @@ -153,11 +153,11 @@
其中待支付费用
- +
其中抵顶费用
- +
抵顶费用说明
@@ -248,7 +248,7 @@ export default { req.fetchBySid(row.sid).then((resp) => { if (resp.success) { this.formobj = resp.data - if (parseFloat(this.formobj.secondaryUploadMoney) === 0) { + if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') { this.checked = false } this.isAdjustmentInput(this.formobj) @@ -320,10 +320,10 @@ export default { val.adjustmentRemarks = '' this.adjustOrNot = true } - if (parseFloat(this.formobj.secondaryUploadMoney) > 0) { - this.checked = true - } else { + if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') { this.checked = false + } else { + this.checked = true } }, changeIsAdjustment(val) { diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue index efe65423f9..be66cd4b20 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -307,7 +307,7 @@
二次上传金额
- + @@ -315,15 +315,15 @@
其中支出费用
- +
其中待支付费用
- +
其中抵顶费用
- + @@ -660,6 +660,26 @@ export default { } this.init() }, + getSpecialNumber(val, limit) { + val = val.replace(/[^0-9.-]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点 + val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 val = val.replace(/^00/, '0.') // 开头不能有两个0 diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index 9919d30d6d..b671de28dc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -102,15 +102,15 @@
其中支出费用
- +
其中待支付费用
- +
其中抵顶费用
- + @@ -127,7 +127,7 @@
上传金额
- + @@ -135,15 +135,15 @@
其中支出费用
- +
其中待支付费用
- +
其中抵顶费用
- + @@ -236,7 +236,7 @@ export default { req.fetchBySid(row.sid).then((resp) => { if (resp.success) { this.formobj = resp.data - if (parseFloat(this.formobj.secondaryUploadMoney) === 0) { + if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') { this.checked = false } this.isAdjustmentInput(this.formobj) @@ -308,10 +308,10 @@ export default { val.adjustmentRemarks = '' this.adjustOrNot = true } - if (parseFloat(this.formobj.secondaryUploadMoney) > 0) { - this.checked = true - } else { + if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') { this.checked = false + } else { + this.checked = true } }, changeIsAdjustment(val) { diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index ad85d92cd7..84b61f247a 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -391,6 +391,8 @@ + + diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue index 73ffe38da0..b00b5473f4 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue @@ -226,6 +226,8 @@ + + diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue index 122aa16cb3..c38a865dbb 100644 --- a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue +++ b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue @@ -125,6 +125,8 @@ + + @@ -135,12 +137,14 @@ + - + + @@ -533,8 +537,10 @@ export default { unit: '', // 计量单位 warehouseName: '', // 仓库名称 warehouseSid: '', - areaName: '', // 库区 - areaSid: '', + wareZoneSid: '', + wareZoneName: '', + wareAreaSid: '', + wareAreaName: '', warehouseRackCode: '', // 库位编号 warehouseRackSid: '', billObjName: '', // 供应商 @@ -585,8 +591,10 @@ export default { row.unit = value.unit row.warehouseName = value.warehouseName row.warehouseSid = value.warehouseSid - row.areaName = value.areaName - row.areaSid = value.areaSid + row.wareZoneSid = value.wareZoneSid + row.wareZoneName = value.wareZoneName + row.wareAreaSid = value.wareAreaSid + row.wareAreaName = value.wareAreaName row.warehouseRackCode = value.warehouseRackCode row.warehouseRackSid = value.warehouseRackSid row.billObjName = value.billObjName diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue index c10f6c03f1..8b8b430cc9 100644 --- a/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue +++ b/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue @@ -80,13 +80,15 @@
商品列表
+ - + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java index e95b0726a2..885b6f0f95 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java @@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -36,6 +35,15 @@ public class GoodsDetailsVo implements Vo { private String warehouseName; //库位编号 private String warehouseRackCode; + + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; // // @ApiModelProperty("需求数量（维修工单中）") // private String needCount; 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 3cdb4db5c6..43c2b6b7bc 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 @@ -112,4 +112,13 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { private String billBusTypeKey; @ApiModelProperty("业务类型Value") private String billBusTypeValue; + + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java index fb8d9fdbf5..1efb1f098e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * @description: * @author: dimengzhe @@ -48,6 +46,15 @@ public class AsBusrepairInventorybillDetailSDto { private String warehouseRackSid; @ApiModelProperty("库位编号") private String warehouseRackCode; + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; + @ApiModelProperty("需求数量") private String needCount; 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 c3f3152557..97761802a7 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 @@ -43,6 +43,15 @@ public class SalesGoodsVo { @ApiModelProperty("商品ID") private String goodsID; // 商品ID + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; + //规格型号 private String goodsSkuOwnSpec; //仓库Sid diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index 25ba9d0967..a8b6119d80 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -115,8 +115,10 @@ i.supplierSid as billObjSid, i.warehouseSid, i.warehouseName, - wa.sid as areaSid, - wa.areaName, + wa.sid as wareAreaSid, + wa.areaName wareAreaName, + wz.sid wareZoneSid, + wz.zoneName wareZoneName, i.warehouseRackSid, i.warehouseRackCode, IF( IFNULL(i.taxRate,0) > 0, '0', '1' ) AS isTaxRate, @@ -128,6 +130,7 @@ LEFT JOIN yxt_wms.wms_warehouse_rack as ra ON ra.sid = i.warehouseRackSid LEFT JOIN yxt_wms.wms_warehouse_area as wa ON ra.locationSid = wa.sid LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid + LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = ra.zoneSid LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = i.goodsID ${ew.sqlSegment} 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 0cb24eab65..968b2e7573 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 @@ -409,6 +409,12 @@ public class SmsSalesBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.oldPageList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -349,6 +352,9 @@ public class WmsOldInventoryService extends MybatisBaseService list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); return list; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java index 3684ec0db5..a95affa0f0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java @@ -36,7 +36,14 @@ public class WmsOutBillInventoryVo { private String warehouseRackSid; @ApiModelProperty("库位编码") private String warehouseRackCode; - + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; private String price;//销售单价 private String cost;//入库单价 private String outboundCount;// 已出库数量 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml index 7911d86600..73968f0ae0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml @@ -43,6 +43,10 @@ wi.warehouseName, wi.warehouseRackSid, wi.warehouseRackCode, + wa.sid wareAreaSid, + wa.areaName wareAreaName, + wz.sid wareZoneSid, + wz.zoneName wareZoneName, wi.count, wi.sid inventorySid, wi.supplierName, @@ -50,6 +54,9 @@ s.price as money from wms_inventory wi LEFT JOIN yxt_wms.wms_warehouse_info as wh ON wh.sid = wi.warehouseSid + LEFT JOIN yxt_wms.wms_warehouse_rack as wr ON wr.sid = wi.warehouseRackSid + LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.sid = wr.locationSid + LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = wr.zoneSid LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = wi.goodsID ${ew.sqlSegment}