bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sliang 2023-12-23 18:30:42 +08:00
parent 133baa8f3f 19a23f3bf8
commit aba4aeb58f
32 changed files with 434 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
View File

@ -22,8 +22,18 @@ public class MaMachine extends BaseEntity {
/**
* 类型ID
*/
@ApiModelProperty(value = "类型ID")
@ApiModelProperty(value = "资产属性id")
private long propId;
/**
* 物品种类
*/
@ApiModelProperty(value = "物品种类id")
private long itemId;
/**
* 设备类型
*/
@ApiModelProperty(value = "设备类型id")
private long deviceId;
/**
* 物品种类
*/
@ -151,246 +161,12 @@ public class MaMachine extends BaseEntity {
private String labelCode;
@ApiModelProperty(value = "筛选名称")
private String keyWord;
@ApiModelProperty(value = "开始时间")
private String beginTime;
public void setMaId(long maId) {
this.maId = maId;
}
public long getTypeId() {
return typeId;
}
public void setTypeId(long typeId) {
this.typeId = typeId;
}
public String getMaCode() {
return maCode;
}
public void setMaCode(String maCode) {
this.maCode = maCode;
}
public String getPreCode() {
return preCode;
}
public void setPreCode(String preCode) {
this.preCode = preCode;
}
public String getMaStatus() {
return maStatus;
}
public void setMaStatus(String maStatus) {
this.maStatus = maStatus;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public String getBuyPrice() {
return buyPrice;
}
public void setBuyPrice(String buyPrice) {
this.buyPrice = buyPrice;
}
public String getMaVender() {
return maVender;
}
public void setMaVender(String maVender) {
this.maVender = maVender;
}
public String getOutFacTime() {
return outFacTime;
}
public void setOutFacTime(String outFacTime) {
this.outFacTime = outFacTime;
}
public String getOutFacCode() {
return outFacCode;
}
public void setOutFacCode(String outFacCode) {
this.outFacCode = outFacCode;
}
public String getAssetsCode() {
return assetsCode;
}
public void setAssetsCode(String assetsCode) {
this.assetsCode = assetsCode;
}
public String getCheckMan() {
return checkMan;
}
public void setCheckMan(String checkMan) {
this.checkMan = checkMan;
}
public String getThisCheckTime() {
return thisCheckTime;
}
public void setThisCheckTime(String thisCheckTime) {
this.thisCheckTime = thisCheckTime;
}
public String getNextCheckTime() {
return nextCheckTime;
}
public void setNextCheckTime(String nextCheckTime) {
this.nextCheckTime = nextCheckTime;
}
public String getGpsCode() {
return gpsCode;
}
public void setGpsCode(String gpsCode) {
this.gpsCode = gpsCode;
}
public String getRfidCode() {
return rfidCode;
}
public void setRfidCode(String rfidCode) {
this.rfidCode = rfidCode;
}
public String getErpCode() {
return erpCode;
}
public void setErpCode(String erpCode) {
this.erpCode = erpCode;
}
public String getTransferCode() {
return transferCode;
}
public void setTransferCode(String transferCode) {
this.transferCode = transferCode;
}
public String getInOutNum() {
return inOutNum;
}
public void setInOutNum(String inOutNum) {
this.inOutNum = inOutNum;
}
public String getBuyTask() {
return buyTask;
}
public void setBuyTask(String buyTask) {
this.buyTask = buyTask;
}
public String getOwnHouse() {
return ownHouse;
}
public void setOwnHouse(String ownHouse) {
this.ownHouse = ownHouse;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getItemType() {
return itemType;
}
public void setItemType(String itemType) {
this.itemType = itemType;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public String getSpecificationType() {
return specificationType;
}
public void setSpecificationType(String specificationType) {
this.specificationType = specificationType;
}
public String getMaStatusName() {
return maStatusName;
}
public void setMaStatusName(String maStatusName) {
this.maStatusName = maStatusName;
}
public String getLabelCode() {
return labelCode;
}
public void setLabelCode(String labelCode) {
this.labelCode = labelCode;
}
public long getPropId() {
return propId;
}
public void setPropId(long propId) {
this.propId = propId;
}
@ApiModelProperty(value = "结束时间")
private String endTime;
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachineLabel.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachineLabel.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.domain;
package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -34,13 +34,13 @@ public class LeaseOutDetailsController extends BaseController {
/**
* 根据code编码查询设备信息
* @param mCode 机具编码
* @param maCode 机具编码
* @return 设备信息
*/
@Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY)
@GetMapping("/getMaMachineByCode")
public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) {
return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode));
public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String maCode) {
return getDataTable(leaseOutDetailsService.getMaMachineByCode(maCode));
}
/**

39
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.app.domain;
import io.swagger.models.auth.In;
import lombok.Data;
/**
@ -86,8 +87,46 @@ public class BackApplyInfo {
private String lotId;
private String unitId;
private String backTime;
private Integer maId;
/**
* 机具管理方式
*/
private String manageType;
/**
* 合格数量
*/
private Integer passNum;
/**
* 维修数量
*/
private Integer maintenanceNum;
/**
* 报废数量
*/
private Integer scrapNum;
/**
* 退料数量
*/
private Integer backNum;
/**
* 退料数量
*/
private String backStatus;
/**
* 合格入库数量
*/
private String inputNum;
/**
* 任务类型
*/
private Integer taskType;
/**
* 任务id
*/
private Integer taskId;
}

18
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -61,19 +61,19 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
// 更新 (ma_machine 设备表)的状态
int updateMaMachineStatus = leaseOutDetailsMapper.updateMaMachineStatus(record);
// 插入(tm_task_agreement 任务协议表)协议信息
int insertAgreementInfo = leaseOutDetailsMapper.insertAgreementInfo(record);
// int insertAgreementInfo = leaseOutDetailsMapper.insertAgreementInfo(record);
// 进行状态判断
if (updateLeaseApplyDetailsOutNum > 0) {
if (insertSelectiveNum > 0) {
if (updateMaTypeStockNum > 0) {
if (updateMaMachineStatus > 0) {
if (insertAgreementInfo > 0) {
// if (updateMaMachineStatus > 0) {
// if (insertAgreementInfo > 0) {
return AjaxResult.success("领料出库成功!");
}
return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
}
return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
// }
// return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
// }
// return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
}
return AjaxResult.error("出库失败,更新设备规格库存数量时出错!");
}
@ -83,8 +83,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
}
/**
* @param maMachine
* @return
* @param maCode 编码ID
* @return 数据
*/
@Override
public List<MaMachine> getMaMachineByCode(String maCode) {

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java
View File

@ -93,7 +93,8 @@ public class MaLabelBindController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody MaLabelBindVO maLabelBindVO)
{
return toAjax(maLabelBindService.insertMaLabelBind(maLabelBindVO));
return maLabelBindService.insertMaLabelBind(maLabelBindVO);
}
/**

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineLabelController.java
View File

@ -2,7 +2,7 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.base.service.IMaMachineLabelService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
View File

@ -15,6 +15,9 @@ public class MaHouseSet {
*/
@ApiModelProperty(value="仓库ID")
private long houseId;
@ApiModelProperty(value="仓库名称")
private String houseName;
/**
* 机具类型ID
*/
@ -255,4 +258,12 @@ public class MaHouseSet {
public void setMaCode(String maCode) {
this.maCode = maCode;
}
public String getHouseName() {
return houseName;
}
public void setHouseName(String houseName) {
this.houseName = houseName;
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineLabelMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaLabelBindService.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import java.util.List;
@ -41,7 +42,7 @@ public interface IMaLabelBindService
* @param maLabelBindVO 机具设备标签ma_label_bind
* @return 结果
*/
public int insertMaLabelBind(MaLabelBindVO maLabelBindVO);
public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBindVO);
/**
* 修改机具设备标签ma_label_bind

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaMachineLabelService.java
View File

@ -1,8 +1,6 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.domain.MaMachineLabel;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Service;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import java.util.List;

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
View File

@ -4,12 +4,10 @@ import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
import com.bonus.sgzb.base.service.IMaLabelBindService;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.utils.StringHelper;
import lombok.extern.flogger.Flogger;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@ -66,13 +64,13 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
* @return 结果
*/
@Override
public int insertMaLabelBind(MaLabelBindVO maLabelBind)
public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBind)
{
int i = 0;
int b =0;
MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode());
if(null != bean){
return b;
return AjaxResult.error("设备编码已绑定！！！");
}else {
MaMachine maMachine =new MaMachine();
maMachine.setMaCode(maLabelBind.getMaCode());
@ -84,7 +82,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind);
i = maLabelBindMapper.insertMaLabelBindS(maLabelBind);
}
return i;
return AjaxResult.success("绑定成功");
}
/**

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineLabelServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.base.mapper.MaMachineLabelMapper;
import com.bonus.sgzb.base.service.IMaMachineLabelService;
import com.bonus.sgzb.common.core.utils.DateUtils;

7
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
View File

@ -91,12 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getHouseSetList" resultType="com.bonus.sgzb.base.domain.MaHouseSet">
select mt.type_name specificationType, mt1.type_name machineTypeName, mt2.type_name itemType ,
mm.ma_code maCode, mhs.house_id, mhs.type_id, mhs.ma_id, mhs.num, mhs.status, mhs.dept_id, mhs.del_flag,
mhs.create_by, mhs.create_time, mhs.update_by,mhs.update_time,mhs.remark,mhs.company_id
from ma_type mt
left join ma_machine mm on mt.type_id = mm.type_id
mhs.create_by, mhs.create_time, mhs.update_by,mhs.update_time,mhs.remark,mhs.company_id,mhi.house_name houseName
from ma_machine mm
left join ma_type mt on mm.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_house_set mhs on mt.type_id = mhs.type_id
left join ma_house_info mhi on mhs.house_id = mhi.house_id
where mt.manage_type = '0' and mt.level = '4'
<if test="houseId != null and houseId != ''">
AND mhs.house_id = #{houseId}

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineLabelMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaMachineLabelMapper">
<resultMap type="com.bonus.sgzb.base.domain.MaMachineLabel" id="MaMachineLabelResult">
<resultMap type="com.bonus.sgzb.base.api.domain.MaMachineLabel" id="MaMachineLabelResult">
<result property="labelId" column="label_id" />
<result property="labelCode" column="label_code" />
<result property="maId" column="ma_id" />
@ -16,7 +16,7 @@
select label_id, label_code, ma_id, is_bind, label_type, company_id
from ma_machine_label
</sql>
<select id="selectMaMachineLabelList" parameterType="com.bonus.sgzb.base.domain.MaMachineLabel" resultMap="MaMachineLabelResult">
<select id="selectMaMachineLabelList" parameterType="com.bonus.sgzb.base.api.domain.MaMachineLabel" resultMap="MaMachineLabelResult">
select label_id, label_code, ma_id, is_bind, label_type, company_id
from ma_machine_label
where is_bind ='0'
@ -26,7 +26,7 @@
from ma_machine_label
where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{nowDate},'%y%m')
</select>
<insert id="insertMaMachineLabel" parameterType="com.bonus.sgzb.base.domain.MaMachineLabel" useGeneratedKeys="true" keyProperty="labelId">
<insert id="insertMaMachineLabel" parameterType="com.bonus.sgzb.base.api.domain.MaMachineLabel" useGeneratedKeys="true" keyProperty="labelId">
insert into ma_machine_label
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="labelCode != null">label_code,</if>

31
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="buyTask" column="buy_task" />
<result property="ownHouse" column="own_house" />
<result property="companyId" column="company_id" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectMaMachine">
@ -37,9 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaMachine" parameterType="com.bonus.sgzb.base.api.domain.MaMachine" resultMap="MaMachineResult">
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price,
m.ma_vender, m.out_fac_time, m.out_fac_code, m.assets_code, m.check_man, m.this_check_time, m.next_check_time,
m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,m.create_time ,m.in_out_num, m.buy_task, m.own_house ,
m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
mmb.label_code labelCode
from ma_machine m
left join (select id,p_id,name from sys_dic where p_id in (select id from sys_dic where value = 'ma_status')) dic on m.ma_status = dic.id
@ -47,12 +49,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
left join ma_prop_set mps on mt.type_id = mps.type_id
<where>
<if test="maId != null and maId != ''">
AND ma_id = #{maId}
</if>
<if test="typeId != null and typeId != ''">
AND type_id = #{typeId}
AND mt.type_id = #{typeId}
</if>
<if test="deviceId != null and deviceId != ''">
AND mt1.type_id = #{deviceId}
</if>
<if test="itemId != null and itemId != ''">
AND mt2.type_id = #{itemId}
</if>
<if test="propId != null and propId != ''">
AND mps.prop_id = #{propId}
</if>
<if test="keyWord != null and keyWord != ''">
AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%'))
</if>
<if test="beginTime != null and endTime != null and beginTime != '' and endTime != null">
AND m.create_time between #{beginTime} and #{endTime}
</if>
</where>
order by m.ma_id desc
@ -69,10 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
<where>
m.ma_code = #{maCode}
</where>
order by m.ma_id desc
where m.ma_code = #{maCode}
</select>

2
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeFileMapper.xml
View File

@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where type_id = #{typeId} and file_type = #{fileType}
</update>
<delete id="deleteMaTypeFileByTypeId" parameterType="Long">
<delete id="deleteMaTypeFileByTypeId">
delete from ma_type_file where type_id = #{typeId} and file_type = #{fileType}
</delete>

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -52,7 +52,7 @@ public class BackApplyController extends BaseController {
*/
@ApiOperation(value = "获取在用物料列表")
@GetMapping("/getMaterialList")
public TableDataInfo getMaterialList(@RequestBody BackApplyInfo bean)
public TableDataInfo getMaterialList(BackApplyInfo bean)
{
startPage();
List<BackApplyInfo> list = backApplyService.getMaterialList(bean);
@ -64,7 +64,7 @@ public class BackApplyController extends BaseController {
*/
@ApiOperation(value = "退料申请详情")
@GetMapping("/getView")
public TableDataInfo getView(@RequestBody BackApplyInfo bean)
public TableDataInfo getView(BackApplyInfo bean)
{
startPage();
List<BackApplyInfo> list = backApplyService.getView(bean);
@ -86,7 +86,7 @@ public class BackApplyController extends BaseController {
*/
@ApiOperation(value = "退料申请删除")
@GetMapping("/del")
public AjaxResult del(@RequestBody BackApplyInfo bean)
public AjaxResult del(BackApplyInfo bean)
{
return backApplyService.del(bean);
}

17
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
View File

@ -86,21 +86,6 @@ public class PurchaseMacodeInfoController extends BaseController
return purchaseMacodeInfoService.insertPurchaseMacodeInfo(purchaseMacodeInfoList);
}
/**
* 生成设备编号
*/
@ApiOperation(value = "生成设备编号")
@PostMapping("/equipmentNumber")
public AjaxResult generateEquipmentNumber(@RequestBody EquipmentNumberVO equipmentNumberVO) throws Exception {
Long typeId = equipmentNumberVO.getTypeId();
if (typeId == null) {
throw new Exception("类型typeId为空!");
}
if (equipmentNumberVO.getCount() == 0) {
throw new Exception("生成数量为0!");
}
return success(purchaseMacodeInfoService.generateEquipmentNumber(equipmentNumberVO));
}
/**
* 修改新购验收编号管理
@ -112,7 +97,7 @@ public class PurchaseMacodeInfoController extends BaseController
}
/**
* 修改新购验收编号管理
* 修改新购验收编号管理,暂时不用
*/
@ApiOperation(value = "修改编码管理的入库状态")
@PutMapping("/manageStatus")

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.material.mapper;
import com.alibaba.fastjson.JSONObject;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.material.domain.MaInputRecord;
import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
@ -102,4 +103,8 @@ public interface PurchaseMacodeInfoMapper {
int selectMaCode(String maCode);
int updateMacodeByType(PurchaseMacodeInfo purchaseMacodeInfo);
int selectLableNumByMonth(Date nowDate);
int insertMaMachineLabel(MaMachineLabel maMachineLabel);
}

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.material.service;
import com.alibaba.fastjson.JSONObject;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.material.domain.MaInputRecord;
import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
@ -65,7 +66,7 @@ public interface IPurchaseMacodeInfoService
*/
public int deletePurchaseMacodeInfoByTaskId(Long taskId);
JSONObject generateEquipmentNumber(EquipmentNumberVO equipmentNumberVO);
String generateEquipmentNumber(MaMachineLabel maMachineLabel);
int deletePurchaseMacodeInfoById(Long id);

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.BmNoticeInfo;
import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
@ -112,6 +113,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
task.setCode(purchaseCodeRule());
task.setCreateTime(DateUtils.getNowDate());
task.setCompanyId(purchaseCheckInfo.getCompanyId());
task.setCreateBy(SecurityUtils.getUsername());
// 创建任务信息
taskMapper.insertTmTask(task);
purchaseCheckInfo.setTaskId(task.getTaskId());

83
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import com.alibaba.fastjson.JSONObject;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.core.utils.StringUtils;
@ -95,15 +96,22 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
}
PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
Long taskId = purchaseMacodeInfo.getTaskId();
TmTask task = taskMapper.selectTmTaskByTaskId(taskId);
Long typeId = purchaseMacodeInfo.getTypeId();
String maCode = purchaseMacodeInfo.getMaCode();
purchaseCheckDetails.setTypeId(typeId);
purchaseCheckDetails.setTaskId(purchaseMacodeInfo.getTaskId());
MaMachineLabel maLabel = new MaMachineLabel();
String qrCode = generateEquipmentNumber(maLabel);
if (StringUtils.isNotEmpty(maCode)) {
MaMachine maMachine = new MaMachine();
maMachine.setTypeId(typeId);
maMachine.setMaStatus("14");
maMachine.setQrCode(purchaseMacodeInfo.getQrCode());
maMachine.setQrCode(qrCode);
maMachine.setBuyTask(task.getCode());
// 设备原厂编号
String fixCode = purchaseMacodeInfo.getFixCode();
if ("0".equals(fixCode)) {
@ -118,16 +126,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
maMachine.setCreateBy(SecurityUtils.getUsername());
purchaseMacodeInfoMapper.maMachineAdd(maMachine);
}
String qrCode = purchaseMacodeInfo.getQrCode();
// 二维码存储
if (StringUtils.isNotEmpty(qrCode)) {
BmQrcodeInfo bmQrcodeInfo = new BmQrcodeInfo();
bmQrcodeInfo.setTypeId(typeId);
bmQrcodeInfo.setQrCode(qrCode);
bmQrcodeInfo.setTaskId(purchaseMacodeInfo.getTaskId());
bmQrcodeInfo.setCreateTime(new Date());
qrcodeInfoMapper.insertBmQrcodeInfo(bmQrcodeInfo);
}
purchaseMacodeInfo.setStatus("0");
purchaseMacodeInfo.setCreateTime(DateUtils.getNowDate());
purchaseMacodeInfoMapper.insertPurchaseMacodeInfo(purchaseMacodeInfo);
@ -215,55 +214,27 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
/**
* 生成设备编号
*
* @param equipmentNumberVO 类型id,生成数量
* @param maMachineLabel 类型id,生成数量
* @return 编码结果
*/
@Override
public JSONObject generateEquipmentNumber(EquipmentNumberVO equipmentNumberVO) {
Long typeId = equipmentNumberVO.getTypeId();
SimpleDateFormat sdf = new SimpleDateFormat("yyMM");
public String generateEquipmentNumber(MaMachineLabel maMachineLabel) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date nowDate = DateUtils.getNowDate();
String format = sdf.format(nowDate);
JSONObject jsonObject = purchaseMacodeInfoMapper.getTypeByTypeId(typeId);
String typeCode = jsonObject.getString("modelCode");
String specsCode = jsonObject.getString("specsCode");
//序列号
int count = purchaseMacodeInfoMapper.getSerialNumber(typeId, nowDate) + 1;
List<String> list = new ArrayList<>();
List<String> codeList = new ArrayList<>();
for (int i = 0; i < equipmentNumberVO.getCount(); i++) {
int i1 = count + i;
// 编码规则
String codingRule = "NSJJ" + specsCode + format + typeCode;
String codeNum = "";
String code = format;
String code1 = format;
if (i1 > 9 && i1 < 100) {
codeNum = "-00" + i1;
code1 = "-00" + i1;
} else if (i1 > 99 && i1 < 1000) {
codeNum = "-0" + i1;
code1 = "-0" + i1;
} else {
codeNum = "-000" + i1;
code1 = "-000" + i1;
}
codingRule = codingRule + codeNum;
code = code + code1;
// 二维码
int i2 = purchaseMacodeInfoMapper.selectMachineByMaCode(codingRule);
if (i2 <= 0) {
list.add(codingRule);
}
codeList.add(code);
String format = dateFormat.format(nowDate);
int lableNum = purchaseMacodeInfoMapper.selectLableNumByMonth(nowDate) + 1;
String code="";
if (lableNum>9 && lableNum<100){
code = format + "-00" + lableNum;
}else if (lableNum>99 && lableNum<1000){
code = format + "-0" + lableNum;
}else {
code = format + "-000" + lableNum;
}
JSONObject result = new JSONObject();
result.put("equipmentNum", list);
result.put("twoDimensionalCode", codeList);
return result;
maMachineLabel.setIsBind("0");
maMachineLabel.setLabelCode(code);
purchaseMacodeInfoMapper.insertMaMachineLabel(maMachineLabel);
return code;
}
/**
@ -278,7 +249,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
}
/**
* 修改编码管理的入库状态
* 修改编码管理的入库状态,暂时不用
*
* @param maInputVO 入库信息
* @return 结果

5
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join tm_task tk on pci.task_id = tk.task_id
left join (select id,name from sys_dic where p_id = 23) dict on tk.task_status = dict.id
left join sys_user su on pci.purchaser = su.user_id
where task_type = 23 and tk.task_status in (24,25,26,27)
where task_type = 23
<if test="purchaseTime != null and purchaseTime != ''"> and tk.code = #{code}</if>
<if test="purchaseTime != null and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
<if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
@ -144,7 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName,
tk.create_by
from purchase_check_info pci
left join tm_task tk on pci.task_id = tk.task_id
left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id

27
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -235,6 +235,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>
<insert id="insertMaMachineLabel" parameterType="com.bonus.sgzb.base.api.domain.MaMachineLabel" useGeneratedKeys="true" keyProperty="labelId">
insert into ma_machine_label
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="labelCode != null">label_code,</if>
<if test="maId != null">ma_id,</if>
<if test="isBind != null">is_bind,</if>
<if test="labelType != null">label_type,</if>
<if test="companyId != null">company_id,</if>
create_time
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="labelCode != null">#{labelCode},</if>
<if test="maId != null">#{maId},</if>
<if test="isBind != null">#{isBind},</if>
<if test="labelType != null">#{labelType},</if>
<if test="companyId != null">#{companyId},</if>
now()
</trim>
</insert>
<select id="selectTypeByTypeId" resultType="com.bonus.sgzb.base.api.domain.MaType">
select type_id typeId, type_name, parent_id, status, num, unit_id, manage_type, lease_price, buy_price, pay_price,
@ -260,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
select pcd.production_time productionTime,mt.type_name specificationType, mt1.type_name typeName, pmi.ma_code maCode,
mm.assets_code assetsCode ,pmi.fix_code fixCode,pcd.type_id typeId,pcd.task_id taskId, mt.code specsCode,mt1.code typeCode,
if(pmi.ma_code is null, if(pcd.status != 4, 0 , 1), pmi.status) status,
if(pmi.ma_code is null, if(pcd.status != 4, 0 , 1), pmi.status) status,mm.qr_code qrCode,
if(pmi.ma_code is not null,1,pcd.check_num) checkNum
from purchase_check_details pcd
left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
@ -268,10 +287,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt on pcd.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
where pcd.task_id = #{taskId}
order by status
</select>
<select id="selectMaCode" resultType="java.lang.Integer">
select count(ma_id) from ma_machine where ma_code = #{maCode}
</select>
<select id="selectLableNumByMonth" resultType="java.lang.Integer">
select count(*)
from ma_machine_label
where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{nowDate},'%y%m')
</select>
<update id="updateTypeByTypeId">
update ma_type set num = #{num} where type_id = #{typeId}

4
sgzb-modules/sgzb-system/pom.xml
View File

@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.1</version>
<version>4.1.2</version>
</dependency>
</dependencies>
@ -123,5 +123,5 @@
</plugin>
</plugins>
</build>
</project>

110
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="后缀范围" prop="count">
<el-form-item label="后缀范围">
<div style="display: flex;"><el-input v-model="form.str" placeholder="0001"></el-input> - <el-input v-model="form.str1" placeholder="0005"></el-input></div>
</el-form-item>
@ -146,10 +146,14 @@
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.maCode" v-bind:class="[scope.row.statusFlag==1 ? redColor : '']"></el-input>
<el-input v-model="scope.row.maCode" :disabled="scope.row.statusFlag==0" οninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column label="固定资产编码" align="center" prop="assetsCode" width="120" />
<el-table-column label="固定资产编码" align="center" prop="assetsCode" >
<template slot-scope="scope">
<el-input v-model="scope.row.assetsCode" v-show="form.isFixed=='0'"></el-input>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
@ -227,9 +231,10 @@ export default {
},
// 表单参数
form: {
exCode:'NSJJ',
count:1,
// isFixed:'',
exCode:'',
str:'',
str1:'',
isFixed:'1',
typeId:''
},
codeList: [],//弹窗列表list
@ -283,16 +288,16 @@ export default {
},
// 取消按钮
cancel() {
this.reset()
this.open = false;
},
// 表单重置
reset() {
this.form = {
maId: undefined,
dictName: undefined,
dictType: undefined,
status: "0",
remark: undefined
str: undefined,
str1: undefined,
isFixed:'1',
};
this.resetForm("form");
},
@ -322,7 +327,11 @@ export default {
/** 编码按钮操作 */ //getCodeList newCodeList
handleCode(row) {
console.log(row)
this.reset()
this.form = row;
this.$set(this.form,'str','')
this.$set(this.form,'str1','')
this.$set(this.form,'isFixed','1')
let arr = this.form.arrivalTime.split('-')
this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
this.form.count = row.checkNum;
@ -341,38 +350,38 @@ export default {
},
//生成列表codeList
createCodeList(){
if(this.codeList.length>=this.form.checkNum){
this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
}else{
for(let i = 0; i < this.form.count; i++) {
let obj = {
typeName:this.form.typeName,
specificationType:this.form.specificationType,
typeId: this.form.typeId,
taskId: this.form.taskId,
assetsCode:'',
isFixed:this.form.isFixed,
}
this.newCodeList.push(obj)
}
console.log(this.newCodeList,'this.newCodeList')
this.codeList = this.getCodeList.concat(this.newCodeList)
}
// if(this.codeList.length>=this.form.checkNum){
// this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
// }else{
// for(let i = 0; i < this.form.count; i++) {
// let obj = {
// typeName:this.form.typeName,
// specificationType:this.form.specificationType,
// typeId: this.form.typeId,
// taskId: this.form.taskId,
// assetsCode:'',
// isFixed:this.form.isFixed,
// }
// this.newCodeList.push(obj)
// }
// console.log(this.newCodeList,'this.newCodeList')
// this.codeList = this.getCodeList.concat(this.newCodeList)
// }
},
//填充按钮
fillingCodeList(){
console.log(Number(this.form.str))
this.codeList = []
let num = Number(this.form.str)
console.log(Number(this.form.str1))
// console.log(Number(this.form.str1))
let num1 = Number(this.form.str1)
let count= num1-num+1;//生成数量
console.log()
let sum = count + this.form.bindNum;
console.log(sum)
if(sum>this.form.checkNum){
this.$modal.msgError("编码数量已超过验收数量");
}else{
// if(sum>this.form.checkNum){
// this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。");
// }else{
if(num1>num){
for(let i = 0; i < count; i++) {
let obj = {
@ -380,14 +389,16 @@ export default {
specificationType:this.form.specificationType,
typeId: this.form.typeId,
taskId: this.form.taskId,
maCode:this.form.exCode+(i+num),
maCode:this.form.exCode+("00000" + (num+i)).slice(-4),
assetsCode:'',
isFixed:this.form.isFixed,
}
this.codeList.push(obj)
}
}else{
this.$modal.msgError("编码后缀范围输入格式不正确");
}
}
// }
},
/** 提交按钮 */
@ -407,15 +418,14 @@ export default {
}else{
editPurchaseMacode(this.codeList).then(response => {
console.log(response.data)
if(response.data && response.length>0){
if(response.data && response.data.length>0){
this.codeList = response.data;
this.$modal.msgError("编码绑定失败,存在重复编码，请重新输入");
}else{
this.$modal.msgSuccess("绑定成功");
this.$modal.msgSuccess("编码绑定成功");
this.open = false;
this.getList();
}
}
});
}
@ -434,13 +444,19 @@ export default {
});
},
delCode(row) {
const maCode = row.maCode ;
this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delMacodeList(maCode);
}).then(() => {
this.getdetailmaCodeList(row);
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
console.log(row)
this.codeList.forEach((item,index) => {
if(item.maCode==row.maCode){
this.codeList.splice(index,1)
}
});
// const maCode = row.maCode ;
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
// return delMacodeList(maCode);
// }).then(() => {
// this.getdetailmaCodeList(row);
// this.$modal.msgSuccess("删除成功");
// }).catch(() => {});
},
// 返回列表页
jumpList(){

14
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -76,7 +76,19 @@
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100">
<!-- <template slot-scope="scope">
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
</template> -->
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">

68
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -118,9 +118,10 @@
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus">
<!-- <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> -->
<template slot-scope="scope">
<span v-if="scope.row.taskStatus=='26'">已验收合格</span>
<span v-if="scope.row.taskStatus=='28'">已入库</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -135,6 +136,7 @@
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.taskStatus=='26'"
@click="handleUpdate(scope.row)"
>审核</el-button>
<!-- <el-button-->
@ -253,12 +255,15 @@
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status=='0'">未入库</span>
<span v-if="scope.row.status=='1'">已入库</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
@ -266,11 +271,13 @@
<el-button
size="mini"
type="text"
v-if="scope.row.status=='0'"
@click="pass(scope.row)"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status=='0'"
@click="refused(scope.row)"
>不通过</el-button>
<!-- <el-button-->
@ -453,16 +460,17 @@ export default {
row.taskId = this.query.taskId;
let obj = {
taskId:this.query.taskId,
checkResult:'1',//1 审核通过 2 驳回 -必填
maId:row.maId,
inputNum:row.checkNum,
maCode:row.maCode,
typeId:row.typeId,
// remark:row.remark,
// repairNum:row.repairNum,
}
let param =[obj]
let param ={
taskId:this.query.taskId,
checkResult:'1',
inputRecordList:[obj]
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
@ -477,11 +485,17 @@ export default {
console.log(this.ids)
this.ids.forEach(item => {
item.taskId = this.query.taskId;
item.checkType = '1'
item.type= item.manageType//0.编号 1.计数
item.typeId= item.typeId
item.maId= item.maId
item.inputNum= item.checkNum
item.maCode= item.maCode
});
changePutinStatus(this.ids).then(response => {
let param ={
taskId:this.query.taskId,
checkResult:'1',
inputRecordList:this.ids
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
this.getDialogTable();
@ -497,16 +511,17 @@ export default {
row.taskId = this.query.taskId;
let obj = {
taskId:this.query.taskId,
id:row.id,
checkType:'2',//1 审核通过 2 驳回 -必填
type:row.manageType,//0.编号 1.计数
maId:row.maId,
maCode:row.maCode,
inputNum:row.checkNum,
typeId:row.typeId,
remark:row.remark,
repairNum:row.repairNum,
}
let param =[obj]
let param ={
taskId:this.query.taskId,
checkResult:'2',
inputRecordList:[obj]
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
@ -521,11 +536,18 @@ export default {
console.log(this.ids)
this.ids.forEach(item => {
item.taskId = this.query.taskId;
item.checkType = '2'
item.type=item.manageType
item.typeId= item.typeId
item.maId= item.maId
item.inputNum= item.checkNum
item.maCode= item.maCode
});
let param ={
taskId:this.query.taskId,
checkResult:'2',
inputRecordList:this.ids
}
changePutinStatus(this.ids).then(response => {
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
this.getDialogTable();

31
sgzb-ui/src/views/store/shelves/shelvesConfig.vue
View File

@ -99,17 +99,17 @@
<!-- v-hasPermi="['system:user:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物品种类" align="center" key="typeId" prop="typeId" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" key="typeId" prop="typeId" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" key="houseName" prop="dept.houseName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="货架编号" align="center" key="houseId" prop="dept.houseId" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="物品种类" align="center" key="itemType" prop="itemType" class-name="" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" key="machineTypeName" prop="machineTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" key="specificationType" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" key="maCode" prop="maCode" />
<el-table-column label="货架编号" align="center" key="houseName" prop="houseName" :show-overflow-tooltip="true" />
<el-table-column
label="操作"
align="center"
@ -124,12 +124,12 @@
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:user:edit']"-->
<!-- >修改</el-button>-->
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
@ -355,16 +355,7 @@ export default {
status: undefined,
deptId: undefined
},
// 列信息
columns: [
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
],
// 表单校验
rules: {
userName: [
@ -432,8 +423,8 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.handleQuery();
// this.queryParams.deptId = data.id;
// this.handleQuery();
},
// 取消按钮

165
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -1,57 +1,72 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="dictName">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物品种类" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请选择物品种类"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="是否是固定资产"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请选择设备类型"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="status">
<el-form-item label="物品种类" prop="itemId">
<el-select
v-model="queryParams.status"
placeholder="规格型号"
clearable
style="width: 240px"
v-model="queryParams.itemId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="typeItem in itemList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceId">
<el-select
v-model="queryParams.deviceId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="规格型号" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择规格型号"
clearable
style="width: 240px"
>
<el-option
v-for="model in modelList"
:key="model.typeId"
:label="model.typeName"
:value="model.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select v-model="queryParams.propId" placeholder="请选择资产属性">
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
@ -73,7 +88,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="devicesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物品种类" align="center" prop="itemType" />
@ -90,10 +105,11 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
</template>
</el-table-column>
<el-table-column label="采购单号" align="center" prop="buyTask" />
<el-table-column label="固定资产编号" align="center" prop="assetsCode" />
<el-table-column label="设备原编号" align="center" prop="preCode" />
<el-table-column label="购置批次" align="center" prop="buyTask" />
<el-table-column label="绑定标签" align="center" prop="typeId" />
<el-table-column label="二维码" align="center" prop="" />
<el-table-column label="所在仓库" align="center" prop="ownHouse" />
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
<!-- <template slot-scope="scope">-->
@ -104,12 +120,13 @@
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="danger"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
@ -157,27 +174,30 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="固定资产编号" prop="assetsCode">
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
<el-form-item label="二维码编号" >
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="采购单号" prop="buyTask">
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备原编号" prop="preCode">
<el-input v-model="form.preCode" placeholder="请输入设备原编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="购置批次" prop="buyTask">
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绑定标签" >
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
<el-form-item label="固定资产编号" prop="assetsCode">
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -227,15 +247,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出入库编号" prop="outFacCode">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
<el-form-item label="出入库次数" prop="outFacCode">
<el-input v-model="form.dictName" placeholder="请输入字典名称" disabled/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="管理员" prop="dictName">
<el-col :span="8">
<el-form-item label="厂家" prop="dictName">
<el-input v-model="form.dictName" placeholder="" />
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="" />
@ -275,7 +295,7 @@
import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
import { getProLists } from "@/api/base/base";
import { imgUpLoad } from "@/api/system/upload";
import { getTypeList } from "@/api/store/warehousing";
export default {
name: "Dict",
@ -297,13 +317,17 @@ export default {
// 总条数
total: 0,
// 字典表格数据
typeList: [],
devicesList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 日期范围
dateRange: [],
itemList:[],
typeList:[],
modelList:[],
// 查询参数
queryParams: {
pageNum: 1,
@ -328,9 +352,24 @@ export default {
created() {
this.getList();
this.getPropData();
this.getTypeList();
},
methods: {
//设备类型
getTypeList() {
getTypeList({level:'2'}).then(response => {
this.itemList = response.data;
}
);
getTypeList({level:'3'}).then(response => {
this.typeList = response.data;
}
);
getTypeList({level:'4'}).then(response => {
this.modelList = response.data;
}
);
},
/** 查询资产属性下拉 */
getPropData() {
getProLists().then(response => {
@ -340,8 +379,10 @@ export default {
/** 查询列表 */
getList() {
this.loading = true;
listMachine(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.queryParams.beginTime=this.dateRange[0]
this.queryParams.endTime=this.dateRange[1]
listMachine(this.queryParams).then(response => {
this.devicesList = response.rows;
this.total = response.total;
this.loading = false;
}

9
sgzb-ui/vue.config.js
View File

@ -35,12 +35,13 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//192.168.0.14:28080
// target: `http://192.168.0.14:21624`,//线上环境
// target: `http://10.40.92.140:8080`,//丁/
//192.168.0.14
// target: `http://112.29.103.165:21624`,//线上环境
target: `http://192.168.0.14:21624`,//线上环境
// target: `http://192.168.4.2:8080`,//丁
// target: `http://10.40.92.138:8080`,//丁/
// target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.111:8080`,//亮
target: `http://10.40.92.59:8080`,//亮
// target: `http://10.40.92.209:8080`,//刘川
changeOrigin: true,