dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
wangh 2023-11-24 17:59:53 +08:00
parent 87147fbcf3
commit f706797001
17 changed files with 96 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/convenienceStore/damage/details.vue
View File

@ -48,7 +48,7 @@
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
</div>

2
fuintAdmin/src/views/convenienceStore/inventory/details.vue
View File

@ -49,7 +49,7 @@
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">生成差异单</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
</div>

4
fuintAdmin/src/views/convenienceStore/inventory/index.vue
View File

@ -73,7 +73,7 @@
<el-tag v-if ="scope.row.approvalStatus == 'await'" size="medium">待审核</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'qrts'" type="success" size="medium">已审核入库</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'yzf'" type="danger" size="medium">已作废</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'ysh'" type="danger" size="medium">已审核</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'ysh'" type="success" size="medium">已审核</el-tag>
</div>
</template>
</el-table-column>
@ -246,6 +246,8 @@ export default {
// 重置
resetQuery() {
this.queryParams = {}
this.getList();
},
// 删除
handleDel(data) {

2
fuintAdmin/src/views/convenienceStore/purchase/details.vue
View File

@ -50,7 +50,7 @@
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled=" storageFlag" @click="storage()">进货并入库</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state =='!await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
</div>

41
fuintAdmin/src/views/member/userInfo.vue
View File

@ -467,14 +467,14 @@
<span class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效]</span>
</div>
</div>
<!-- <div style="display:flex;margin-left: 20px">
<div style="display:flex;margin-left: 20px">
<div style="line-height: 40px;width: 20%">提成员工</div>
<div>
<el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
<el-button slot="append" @click="chooseStaff">选择员工</el-button>
</el-input>
</div>
</div> -->
</div>
</div>
</el-col>
</el-row>
@ -519,7 +519,7 @@
</el-dialog>
<!-- 确认充值-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
<div v-if="isPay == true"
<div v-if="isPay"
v-loading="loading">
<div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
@ -1021,7 +1021,11 @@ export default {
},
valueAmoutChange(data) {
if(data == '' || data == null) {
data = 0
this.cardValueForm.amount = 0
}
this.cardValueForm.points = ''
this.cardValueForm.bidBalance =''
@ -1105,6 +1109,15 @@ export default {
this.cardValueForm.staffMobile= data.staffMobile
},
refStaff() {
this.cardFuelDieselForm.mtStaffId= ''
this.cardFuelDieselForm.realName= ''
this.cardFuelDieselForm.staffMobile= ''
this.cardValueForm.mtStaffId= ''
this.cardValueForm.realName= ''
this.cardValueForm.staffMobile= ''
},
// 查询参加存油卡油品
getCountOilType() {
getCountOilTypeApi().then(res => {
@ -1172,8 +1185,12 @@ export default {
this.realyPayBills = this.cardFuelDieselForm.rechargeBalance
}
this.isPay = true
this.openConfirm = true;
this.isPay = true
console.log("11111",this.isPay)
// this.isPaySuccess=false
this.title = this.payment
},
// 支付方式
@ -1230,8 +1247,9 @@ export default {
this.cardValueForm.giftBalance = 0
this.cardValueForm.growthValue = 0
this.cardValueForm.bidBalance = 0
// this.cardValueForm.bidBalance = 1
// this.cardValueForm.amount = 0
this.cardValueForm.amount = 0
}else {
let file={}
@ -1307,7 +1325,7 @@ export default {
}
});
let this_ = this
//
let timer = setInterval(async () => {
getCheckTheStatusOfYourPaymentApi(id).then(response => {
if (response.data!=null){
@ -1331,10 +1349,12 @@ export default {
this_.loading = false;
this_.isPay = false;
clearInterval(timer);
clearTimeout(timer3);
}
},500)
setTimeout(function (){
var timer3 = setTimeout(function (){
clearInterval(timer2);
clearInterval(timer);
this_.loading = false;
@ -1411,11 +1431,13 @@ export default {
// 关闭支付窗口
handClose(){
this.isPay = true;
this.isPay=true,
this.isPaySuccess=false,
this.isQuery=true,
this.openConfirm = false
this.openRecharge = false
this.isPaySuccess = false;
// this.isPaySuccess = false;
this.authCode = null
this.activeRecharge='balance',
@ -1469,6 +1491,7 @@ export default {
},
handleClick(tab, event) {
// console.log(tab, event);
this.refStaff()
this.realyPayBills = 0
},
handleChange(value) {

2
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -144,7 +144,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
},
rules: {
gunName: [
{ required: true, message: '请输入油罐名称', trigger: 'blur' },
{ required: true, message: '请输入油枪名称', trigger: 'blur' },
],
tankId: [

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java
View File

@ -108,7 +108,7 @@ public class MtPurchaseController extends BaseController {
/**
* 盘点审核
* 进货审核
* @param id
* @return
*/
@ -117,11 +117,21 @@ public class MtPurchaseController extends BaseController {
return getSuccessResult(this.mtPurchaseService.audit(id));
}
/**
* 进货废除
* @param id
* @return
*/
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
return getSuccessResult(this.mtPurchaseService.abolition(id));
}
/**
* 进货入库
* @param id
* @return
*/
@GetMapping("storage")
public ResponseObject storage(Integer id) {
return getSuccessResult(this.mtPurchaseService.storage(id));

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml
View File

@ -144,6 +144,7 @@
left join mt_goods mg ON md.goods_id = mg.id
where
damage_id = #{mtDamageDetails.damageId}
</select>
<select id="getListByExcel"
resultType="com.fuint.business.convenienceSore.vo.excel.MtDamageDetailsExcel">

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtPurchaseDetailsMapper.xml
View File

@ -151,15 +151,14 @@
mg.supplier_id supplierId,
mg.id goodsId,
mg.stock stock,
mg.store_id storeId,
mp.order_number orderNumber
from mt_purchase_details md
left join mt_purchase mp ON md.purchase_id = mp.id
left join mt_goods mg ON md.goods_id = mg.id
<where>
purchase_id = #{mtPurchaseDetails.purchaseId}
<if test="mtPurchaseDetails.storeId != null">
and md.store_id = #{mtPurchaseDetails.storeId}
</if>
and md.store_id = #{mtPurchaseDetails.storeId}
</where>
</select>
<select id="getListByExcel"

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtDamageServiceImpl.java
View File

@ -191,7 +191,7 @@ public class MtDamageServiceImpl implements MtDamageService {
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
stockTrack.setStoreId(nowAccountInfo.getStoreId());
stockTrack.setDocument("商品报损");
stockTrack.setChangeNumber(-mtReturnsDetailsVO.getDamageQuantity());
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtInventoryServiceImpl.java
View File

@ -169,7 +169,7 @@ public class MtInventoryServiceImpl implements MtInventoryService {
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
stockTrack.setStoreId(nowAccountInfo.getStoreId());
stockTrack.setDocument("商品盘点");
stockTrack.setChangeNumber(mtReturnsDetailsVO.getInventoryDiscrepancy().intValue());
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
View File

@ -186,11 +186,13 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
@Transactional(rollbackFor = Exception.class)
public boolean storage(Integer id) {
String oilIntake = "进货入库";
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
int audit = iljStaffService.auditPrem(oilIntake);
if (audit>0) {
// 1.查询所有的数据
MtPurchaseDetails mtPurchaseDetails = new MtPurchaseDetails();
mtPurchaseDetails.setPurchaseId(id);
mtPurchaseDetails.setStoreId(nowAccountInfo.getStoreId());
List<MtPurchaseDetailsVO> allList2 = detailsMapper.getAllList2(mtPurchaseDetails);
for (MtPurchaseDetailsVO mtPurchaseDetailsVO : allList2) {
// 修改库存
@ -200,7 +202,7 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtPurchaseDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtPurchaseDetailsVO.getStoreId());
stockTrack.setStoreId(nowAccountInfo.getStoreId());
stockTrack.setDocument("商品进货");
stockTrack.setChangeNumber(mtPurchaseDetailsVO.getQuantityPurchased());
stockTrack.setOddNumber(mtPurchaseDetailsVO.getOrderNumber());

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtReturnsServiceImpl.java
View File

@ -192,7 +192,7 @@ public class MtReturnsServiceImpl implements MtReturnsService {
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
StockTrack stockTrack = new StockTrack();
stockTrack.setStockId(stockStatistic.getId());
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
stockTrack.setStoreId(nowAccountInfo.getStoreId());
stockTrack.setDocument("商品退货");
stockTrack.setChangeNumber(-mtReturnsDetailsVO.getReturnQuantity());
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -160,6 +160,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
Double theAmountToBePaid = 0.0;
boolean flag = false;
System.out.println("cardFuelRecordDTO.getRechargeBalance():"+cardFuelRecordDTO.getRechargeBalance());
double epsilon = 1e-10; // 阈值
if (!ObjectUtil.isEmpty(cardFuelRecordDTO.getRechargeBalance())

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -106,6 +106,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
double epsilon = 1e-10; // 阈值
Double theAmountToBePaid = 0.0;
System.out.println("cardFuelRecordDTO.getRechargeBalance():"+cardValueRecordDTO.getRealyPayBills());
boolean flag = false;
// 先判断是否为自定义金额
if (!ObjectUtil.isEmpty(cardValueRecordDTO.getRealyPayBills())

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java
View File

@ -3,7 +3,9 @@ package com.fuint.business.petrolStationManagement.service.impl;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.petrolStationManagement.entity.OilTank;
import com.fuint.business.petrolStationManagement.entity.OilTracking;
import com.fuint.business.petrolStationManagement.mapper.OilTankMapper;
import com.fuint.business.petrolStationManagement.mapper.OilTrackingMapper;
import com.fuint.business.petrolStationManagement.service.OilTankService;
import com.fuint.business.petrolStationManagement.vo.OilTankExcel;
import com.fuint.common.dto.AccountInfo;
@ -27,7 +29,8 @@ import java.util.List;
public class OilTankServiceImpl implements OilTankService {
@Resource
private OilTankMapper oilTankDao;
@Resource
OilTrackingMapper oilTrackingMapper;
/**
* 通过ID查询单条数据
*
@ -80,6 +83,17 @@ public class OilTankServiceImpl implements OilTankService {
oilTank.setStoreId(nowAccountInfo.getStoreId());
oilTank.setCreateBy(nowAccountInfo.getStaffId().toString());
this.oilTankDao.insert(oilTank);
// 添加到库存跟踪 （初始化时）
OilTracking oilTracking = new OilTracking();
oilTracking.setStoreId(nowAccountInfo.getStoreId());
oilTracking.setCreateBy(nowAccountInfo.getStaffId().toString());
oilTracking.setDocument("油罐库存初始化");
oilTracking.setQuantityChange(oilTank.getStoredQuantity());
oilTracking.setTankId(oilTank.getId());
oilTracking.setOrderNumber("-");
oilTrackingMapper.insert(oilTracking);
return oilTank;
}

22
fuintCashierWeb/src/views/details/index.vue
View File

@ -537,14 +537,14 @@
<span class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效]</span>
</div>
</div>
<!-- <div style="display:flex;margin-left: 20px">
<div style="display:flex;margin-left: 20px">
<div style="line-height: 40px;width: 20%">提成员工</div>
<div>
<el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
<el-button slot="append" @click="chooseStaff">选择员工</el-button>
</el-input>
</div>
</div> -->
</div>
</div>
</el-col>
</el-row>
@ -1217,6 +1217,15 @@ export default {
this.cardValueForm.staffMobile= data.staffMobile
},
refStaff() {
this.cardFuelDieselForm.mtStaffId= ''
this.cardFuelDieselForm.realName= ''
this.cardFuelDieselForm.staffMobile= ''
this.cardValueForm.mtStaffId= ''
this.cardValueForm.realName= ''
this.cardValueForm.staffMobile= ''
},
// 查询参加存油卡油品
getCountOilType() {
getCountOilTypeApi().then(res => {
@ -1448,11 +1457,13 @@ export default {
// 关闭支付窗口
handClose(){
this.isPay = true;
this.isPay=true,
this.isPaySuccess=false,
this.isQuery=true,
this.openConfirm = false
this.openRecharge = false
this.isPaySuccess = false;
// this.isPaySuccess = false;
this.authCode = null
this.activeRecharge='balance',
@ -1533,6 +1544,9 @@ export default {
this.openConfirm = false;
},
handleClick(tab, event) {
this.refStaff();
this.realyPayBills = 0
// console.log(tab, event);
},
handleChange(value) {