Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-26 6c1d7e07b794cb54aaafa371372283e0c989e0d2

Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

 zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java

@@ -122,7 +122,7 @@
    }

    public BigDecimal getPeopleNum() {
        return peopleNum;
        return peopleNum == null ? peopleNum : peopleNum.setScale(2, BigDecimal.ROUND_DOWN);
    }

    public void setPeopleNum(BigDecimal peopleNum) {

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -621,7 +621,7 @@
    @Override
    public int modifyPLProjServices(SysProjServices projServicesVo) throws GlobleException {
        SysProjServices projServices = sysProjServicesDao.selectById(projServicesVo.getId());

        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if (!projServices.getState().equals(Dictionary.SERVICE_STATU_XPL)) {
            throw new GlobleException("该服务单状态为" + projServices.getState() + ",不可以进行当前操作!");
        }
@@ -636,7 +636,7 @@
            if(projServices.getDevisionId()!=null){
                outStore.setStaffId(projServices.getDevisionId());
            }else{
                SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);

                outStore.setStaffId(sysUsers.getSuId());
            }
            outStore.setServiceId(projServices.getId());
@@ -676,8 +676,6 @@
                        sysOutStoreItem.setStoreId(storeInfo.getId());
                        sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal());
                        realOutStoreItemList.add(sysOutStoreItem);


                        storeInfoDao.update(storeInfo);
                        //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量
                        if (surplus > 0) {
@@ -691,30 +689,15 @@
                    LogUtil.debug("未选择配料跳过sku={},amount={}", item.getSkuId(), item.getAmount());
                }
            }

            sysOutStoreItemDao.batchInsert(realOutStoreItemList);

        }

        // 设置服务单状态
        projServices.setState(Dictionary.SERVICE_STATU_PLWC);
        // 设置服务单操作流水
        // TODO 本功能待完善记录最新的排班员工
    /*    List<LastestWorkBeatuistaff> lastList = LastestWorkBeatuistaffDao.selectByModel(null);
        LastestWorkBeatuistaff lastWork = new LastestWorkBeatuistaff();
        if (lastList.size() > 0) {
            lastWork.setChangeDate(new Date());
            lastWork.setStaffId(projServices.getBeauticianId());
            LastestWorkBeatuistaffDao.insert(lastWork);
        } else {
        if(projServices.getDevisionId()==null){
            //如果没有设置配料师则默认为操作配料的人为配料师
            projServices.setDevisionId(sysUsers.getSuId());

            //TODO 有bug集合为零了
            LastestWorkBeatuistaff modifyObj = lastList.get(0);
            modifyObj.setChangeDate(new Date());
            modifyObj.setStaffId(projServices.getBeauticianId());
            LastestWorkBeatuistaffDao.update(modifyObj);
        }*/

        }
        return sysProjServicesDao.update(projServices);
    }


 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html

@@ -38,7 +38,10 @@
                    <i class="el-icon-s-order" type="primary"></i>
                </el-col>
                <el-col :span="10">
                    <h1 style="line-height: 60px; margin: 0 0;">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
                    <h1 style="line-height: 60px; margin: 0 0;display: inline-block">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
                </el-col>
                <el-col :span="5">
                    <h1 style="line-height: 60px; margin: 0 0;display: inline-block"><span style="color: #cf2d27;float: right ">￥{{serviceOrderInfo.money}}</span></h1>
                </el-col>
                <el-col :span="5" style="float: right; margin-right: 10px;">
                    <el-button type="info" @click="printf">打印</el-button>
@@ -60,7 +63,7 @@
                    <p>预约时间：{{dateFormat(serviceOrderInfo.yyTime)}}</p>
                </el-col>
                <el-col :span="3">
                    <p>配料师：{{pylFormat()}}</p>
                    <p>配料师：{{serviceOrderInfo.plsName}}</p>
                    <p>备注：{{serviceOrderInfo.remark}}</p>
                </el-col>
            </el-row>
@@ -74,6 +77,16 @@
                                prop="projInfo.name"
                                label="商品名称"
                                width="280">
                        </el-table-column>
                        <el-table-column
                                :formatter="hkPrice"
                                label="划扣金额"
                                width="200">
                        </el-table-column>
                        <el-table-column
                                prop="count"
                                label="次数"
                                width="200">
                        </el-table-column>
                        <el-table-column
                                prop="projInfo.timeLength"
@@ -144,20 +157,7 @@
                    }
                }
            },
            pylFormat() {
                if (!this.plsList) {
                    return;
                }

                var plsList = this.plsList;
                var doctorId = this.serviceOrderInfo.doctorId;

                for(var i = 0; i < plsList.length; i++) {
                    if (plsList[i].id = doctorId) {
                        return plsList[i].staffName;
                    }
                }
            },
            printf() {
                var id = this.serviceOrderInfo.id;
                layer.open({
@@ -180,6 +180,10 @@
                var startTime = this.dateFormat(row.beginTime);
                var endTime = this.dateFormat(row.endTime);
                return startTime + " - " + endTime;
            },
            hkPrice(row, column) {
                console.log(row);
                return row.projUse.price *  row.count ;
            }
        },
    });