bug修复
This commit is contained in:
parent
402f7e4cfb
commit
b95f57390e
|
|
@ -165,10 +165,12 @@ public class BmUnitServiceImpl implements IBmUnitService
|
|||
}
|
||||
//判断手机号是否合法
|
||||
if (StringUtils.isNotBlank(bmUnit.getTelphone()) && !PhoneUtil.isMobile(bmUnit.getTelphone())) {
|
||||
String telphone = Sm4Utils.encrypt(bmUnit.getTelphone());
|
||||
bmUnit.setTelphone(telphone);
|
||||
return AjaxResult.error(HttpCodeEnum.INVALID_PHONE_FORMAT.getCode(), HttpCodeEnum.INVALID_PHONE_FORMAT.getMsg());
|
||||
}
|
||||
if (StringUtils.isNotBlank(bmUnit.getTelphone())) {
|
||||
String telPhone = Sm4Utils.encrypt(bmUnit.getTelphone());
|
||||
bmUnit.setTelphone(telPhone);
|
||||
}
|
||||
bmUnit.setUpdateTime(DateUtils.getNowDate());
|
||||
bmUnit.setUpdateBy(SecurityUtils.getUserId().toString());
|
||||
int result = bmUnitMapper.updateBmUnit(bmUnit);
|
||||
|
|
|
|||
|
|
@ -120,19 +120,19 @@ public class InputApplyDetailsController extends BaseController {
|
|||
|
||||
|
||||
|
||||
/**
|
||||
* 修试入库二维码扫描
|
||||
*/
|
||||
@ApiOperation(value = "新增入库任务详细")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("input:details:code")
|
||||
@SysLog(title = "扫描入库", businessType = OperaType.UPDATE, logType = 1,module = "修试入库->增加库存")
|
||||
@PostMapping
|
||||
public AjaxResult sanQrcodeInput(@RequestBody InputApplyDetails inputApplyDetails) {
|
||||
try {
|
||||
return toAjax(inputApplyDetailsService.sanInput(inputApplyDetails));
|
||||
} catch (Exception e) {
|
||||
return error("系统错误, " + e.getMessage());
|
||||
}
|
||||
}
|
||||
// /**
|
||||
// * 修试入库二维码扫描
|
||||
// */
|
||||
// @ApiOperation(value = "新增入库任务详细")
|
||||
// @PreventRepeatSubmit
|
||||
// @RequiresPermissions("input:details:code")
|
||||
// @SysLog(title = "扫描入库", businessType = OperaType.UPDATE, logType = 1,module = "修试入库->增加库存")
|
||||
// @PostMapping
|
||||
// public AjaxResult sanQrcodeInput(@RequestBody InputApplyDetails inputApplyDetails) {
|
||||
// try {
|
||||
// return toAjax(inputApplyDetailsService.sanInput(inputApplyDetails));
|
||||
// } catch (Exception e) {
|
||||
// return error("系统错误, " + e.getMessage());
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private String maCode;
|
||||
|
||||
@ApiModelProperty(value = "物资单位名称")
|
||||
@Excel(name = "单位", sort = 3)
|
||||
private String unitName;
|
||||
|
||||
@ApiModelProperty(value = "数值")
|
||||
|
|
@ -69,27 +70,25 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private String maTypeName;
|
||||
|
||||
/** 采购单价(不含税) */
|
||||
@Excel(name = "采购单价(不含税)", sort = 3)
|
||||
@Excel(name = "购置单价(不含税)", sort = 6)
|
||||
@ApiModelProperty(value = "采购单价(不含税)")
|
||||
private BigDecimal purchasePrice;
|
||||
|
||||
/** 采购单价(含税) */
|
||||
@Excel(name = "采购单价(含税)", sort = 4)
|
||||
@Excel(name = "购置单价(元含税)", sort = 5)
|
||||
@ApiModelProperty(value = "采购单价(含税)")
|
||||
private BigDecimal purchaseTaxPrice;
|
||||
|
||||
/** 采购数量 */
|
||||
@Excel(name = "采购数量", sort = 5)
|
||||
@Excel(name = "采购数量", sort = 4)
|
||||
@ApiModelProperty(value = "采购数量")
|
||||
private BigDecimal purchaseNum;
|
||||
|
||||
/** 验收数量 */
|
||||
@Excel(name = "验收数量", sort = 6)
|
||||
@ApiModelProperty(value = "验收数量")
|
||||
private BigDecimal checkNum;
|
||||
|
||||
/** 绑定数量 */
|
||||
@Excel(name = "绑定数量", sort = 7)
|
||||
@ApiModelProperty(value = "绑定数量")
|
||||
private BigDecimal bindNum;
|
||||
|
||||
|
|
@ -117,13 +116,13 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private String supplierName;
|
||||
|
||||
/** 状态，参考数据字典purchase_task_status键值 */
|
||||
@Excel(name = "状态", readConverterExp = "1=待通知,2=待验收,3=待绑定,4=待入库,12=验收被驳回,13=绑定被驳回,14=入库被驳回,19=已入库,21=入库进行中,22=入库已完成", sort = 11)
|
||||
// @Excel(name = "状态", readConverterExp = "1=待通知,2=待验收,3=待绑定,4=待入库,12=验收被驳回,13=绑定被驳回,14=入库被驳回,19=已入库,21=入库进行中,22=入库已完成", sort = 11)
|
||||
@ApiModelProperty(value = "状态，参考数据字典purchase_task_status键值")
|
||||
private Integer status;
|
||||
|
||||
/** 出厂日期 */
|
||||
@ApiModelProperty(value = "出厂日期")
|
||||
@Excel(name = "出厂日期", width = 30, sort = 10)
|
||||
@Excel(name = "出厂日期", width = 30, sort = 9)
|
||||
private String productionTime;
|
||||
|
||||
/** 验收图片 */
|
||||
|
|
@ -137,19 +136,18 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private String checkUrl;
|
||||
|
||||
/** 入库数量 */
|
||||
@Excel(name = "入库数量", sort = 8)
|
||||
@ApiModelProperty(value = "入库数量")
|
||||
private BigDecimal inputNum;
|
||||
|
||||
/** 是否入库 */
|
||||
@Excel(name = "是否入库", readConverterExp = "0=否,1=是")
|
||||
// @Excel(name = "是否入库", readConverterExp = "0=否,1=是")
|
||||
@ApiModelProperty(value = "是否入库")
|
||||
private String inputStatus;
|
||||
|
||||
/** 入库时间 */
|
||||
@ApiModelProperty(value = "入库时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd", sort = 9)
|
||||
// @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd", sort = 9)
|
||||
private Date inputTime;
|
||||
|
||||
/** 验收附件名称 */
|
||||
|
|
@ -168,11 +166,12 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private Long companyId;
|
||||
|
||||
/** 是否是固定资产编号(0 否，1 是) */
|
||||
@Excel(name = "是否固定资产", readConverterExp = "0=否,1=是",sort = 8)
|
||||
@ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)")
|
||||
private String fixCode;
|
||||
|
||||
/** 管理方式(0编号 1计数) */
|
||||
@Excel(name = "管理方式", readConverterExp = "0=编号,1=计数", sort = 12)
|
||||
// @Excel(name = "管理方式", readConverterExp = "0=编号,1=计数", sort = 12)
|
||||
@ApiModelProperty(value = "管理方式(0编号 1计数)")
|
||||
private Integer manageType;
|
||||
|
||||
|
|
@ -186,7 +185,8 @@ public class PurchaseCheckDetails extends BaseEntity {
|
|||
private Integer isExitFile;
|
||||
|
||||
/** 租赁价格 */
|
||||
@ApiModelProperty(value = "租赁价格")
|
||||
@Excel(name = "租赁价(元/天)",sort = 7)
|
||||
@ApiModelProperty(value = "租赁价(元/天)")
|
||||
private BigDecimal rentPrice;
|
||||
|
||||
@ApiModelProperty(value = "文件实收份数")
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="modelTitle != null and modelTitle != ''">
|
||||
and bs.model_title like concat('%', #{modelTitle}, '%')
|
||||
</if>
|
||||
<if test="typeName != null and typeName != ''">
|
||||
and mt.type_name like concat('%', #{typeName}, '%')
|
||||
<if test="typeId != null">
|
||||
and mt.type_id = #{typeId}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY bs.create_time DESC
|
||||
|
|
|
|||
Loading…
Reference in New Issue