Compare commits
No commits in common. "efe50ba2b15eeeb2a3ce1bdc9eb5bbe66da6eea7" and "2a649e921e288e84b936a40a1d04f93ec67e15e0" have entirely different histories.
efe50ba2b1
...
2a649e921e
|
|
@ -153,9 +153,7 @@ public class LeaseOutDetails implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty(value = "数据所属组织")
|
||||
private Integer companyId;
|
||||
@ApiModelProperty(value = "出库类型 0编码出库 1数量出库")
|
||||
@ApiModelProperty(value = "出库类型")
|
||||
private Integer manageType;
|
||||
@ApiModelProperty(value = "数量出库-出库数量")
|
||||
private Integer inputNum;
|
||||
|
||||
}
|
||||
|
|
@ -59,11 +59,6 @@ public class TmTask implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty(value="已出库数量")
|
||||
private Integer alNum;
|
||||
/**
|
||||
* 库存
|
||||
*/
|
||||
@ApiModelProperty(value="库存")
|
||||
private Integer num;
|
||||
|
||||
/**
|
||||
* 编号
|
||||
|
|
|
|||
|
|
@ -147,9 +147,6 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
|
|||
// 1、判断是否重复提交
|
||||
res = checkRepeatSubmit(record);
|
||||
if (res > 0) {
|
||||
if (record.getManageType() == 1 && record.getInputNum() != null) {
|
||||
record.setOutNum(record.getInputNum().doubleValue());
|
||||
}
|
||||
//2、判断库存是否足够
|
||||
res = checkStorageNum(record);
|
||||
if (res > 0) {
|
||||
|
|
|
|||
|
|
@ -945,7 +945,6 @@
|
|||
mt2.type_name as typeName,
|
||||
mt.type_name as typeModelName,
|
||||
mt.manage_type as manageType,
|
||||
mt.num as num,
|
||||
su.user_name as userName,
|
||||
lad.type_id as typeId
|
||||
FROM
|
||||
|
|
@ -960,11 +959,5 @@
|
|||
<if test="userId != 1">
|
||||
and mtk.user_id = #{userId}
|
||||
</if>
|
||||
<if test="userName != null and userName != ''">
|
||||
and su.user_name = #{userName}
|
||||
</if>
|
||||
<if test="typeId != null and typeId != ''">
|
||||
and lad.type_id = #{typeId}
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue