purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化序列号模块

Browse Source
This commit is contained in:
季圣华
2021-10-04 23:47:06 +08:00
parent 89565ec769
commit f1b119a6a9
12 changed files with 202 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
View File

@@ -25,7 +25,9 @@ public class SerialNumber {
private Long updater;
private Long depotHeadId;
private String inBillNo;
private String outBillNo;
private Long tenantId;
@@ -117,12 +119,20 @@ public class SerialNumber {
this.updater = updater;
}
public Long getDepotHeadId() {
return depotHeadId;
public String getInBillNo() {
return inBillNo;
}
public void setDepotHeadId(Long depotHeadId) {
this.depotHeadId = depotHeadId;
public void setInBillNo(String inBillNo) {
this.inBillNo = inBillNo == null ? null : inBillNo.trim();
}
public String getOutBillNo() {
return outBillNo;
}
public void setOutBillNo(String outBillNo) {
this.outBillNo = outBillNo == null ? null : outBillNo.trim();
}
public Long getTenantId() {

128
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
View File

@@ -805,63 +805,143 @@ public class SerialNumberExample {
return (Criteria) this;
}
public Criteria andDepotHeadIdIsNull() {
addCriterion("depot_head_id is null");
public Criteria andInBillNoIsNull() {
addCriterion("in_bill_no is null");
return (Criteria) this;
}
public Criteria andDepotHeadIdIsNotNull() {
addCriterion("depot_head_id is not null");
public Criteria andInBillNoIsNotNull() {
addCriterion("in_bill_no is not null");
return (Criteria) this;
}
public Criteria andDepotHeadIdEqualTo(Long value) {
addCriterion("depot_head_id =", value, "depotHeadId");
public Criteria andInBillNoEqualTo(String value) {
addCriterion("in_bill_no =", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdNotEqualTo(Long value) {
addCriterion("depot_head_id <>", value, "depotHeadId");
public Criteria andInBillNoNotEqualTo(String value) {
addCriterion("in_bill_no <>", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdGreaterThan(Long value) {
addCriterion("depot_head_id >", value, "depotHeadId");
public Criteria andInBillNoGreaterThan(String value) {
addCriterion("in_bill_no >", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdGreaterThanOrEqualTo(Long value) {
addCriterion("depot_head_id >=", value, "depotHeadId");
public Criteria andInBillNoGreaterThanOrEqualTo(String value) {
addCriterion("in_bill_no >=", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdLessThan(Long value) {
addCriterion("depot_head_id <", value, "depotHeadId");
public Criteria andInBillNoLessThan(String value) {
addCriterion("in_bill_no <", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdLessThanOrEqualTo(Long value) {
addCriterion("depot_head_id <=", value, "depotHeadId");
public Criteria andInBillNoLessThanOrEqualTo(String value) {
addCriterion("in_bill_no <=", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdIn(List<Long> values) {
addCriterion("depot_head_id in", values, "depotHeadId");
public Criteria andInBillNoLike(String value) {
addCriterion("in_bill_no like", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdNotIn(List<Long> values) {
addCriterion("depot_head_id not in", values, "depotHeadId");
public Criteria andInBillNoNotLike(String value) {
addCriterion("in_bill_no not like", value, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdBetween(Long value1, Long value2) {
addCriterion("depot_head_id between", value1, value2, "depotHeadId");
public Criteria andInBillNoIn(List<String> values) {
addCriterion("in_bill_no in", values, "inBillNo");
return (Criteria) this;
}
public Criteria andDepotHeadIdNotBetween(Long value1, Long value2) {
addCriterion("depot_head_id not between", value1, value2, "depotHeadId");
public Criteria andInBillNoNotIn(List<String> values) {
addCriterion("in_bill_no not in", values, "inBillNo");
return (Criteria) this;
}
public Criteria andInBillNoBetween(String value1, String value2) {
addCriterion("in_bill_no between", value1, value2, "inBillNo");
return (Criteria) this;
}
public Criteria andInBillNoNotBetween(String value1, String value2) {
addCriterion("in_bill_no not between", value1, value2, "inBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoIsNull() {
addCriterion("out_bill_no is null");
return (Criteria) this;
}
public Criteria andOutBillNoIsNotNull() {
addCriterion("out_bill_no is not null");
return (Criteria) this;
}
public Criteria andOutBillNoEqualTo(String value) {
addCriterion("out_bill_no =", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoNotEqualTo(String value) {
addCriterion("out_bill_no <>", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoGreaterThan(String value) {
addCriterion("out_bill_no >", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoGreaterThanOrEqualTo(String value) {
addCriterion("out_bill_no >=", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoLessThan(String value) {
addCriterion("out_bill_no <", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoLessThanOrEqualTo(String value) {
addCriterion("out_bill_no <=", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoLike(String value) {
addCriterion("out_bill_no like", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoNotLike(String value) {
addCriterion("out_bill_no not like", value, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoIn(List<String> values) {
addCriterion("out_bill_no in", values, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoNotIn(List<String> values) {
addCriterion("out_bill_no not in", values, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoBetween(String value1, String value2) {
addCriterion("out_bill_no between", value1, value2, "outBillNo");
return (Criteria) this;
}
public Criteria andOutBillNoNotBetween(String value1, String value2) {
addCriterion("out_bill_no not between", value1, value2, "outBillNo");
return (Criteria) this;
}

24
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
View File

@@ -14,22 +14,6 @@ import java.util.List;
* @Date: 2019/1/21 17:09
*/
public interface SerialNumberMapperEx {
/**
* 根据条件查询序列号列表
* */
List<SerialNumberEx> selectByConditionSerialNumber(@Param("serialNumber") String serialNumber, @Param("materialName") String materialName,@Param("offset") Integer offset,@Param("rows") Integer rows);
/**
* 根据条件查询序列号数量
* */
Long countSerialNumber(@Param("serialNumber")String serialNumber,@Param("materialName")String materialName);
/**
* 通过id查询序列号复合信息
* */
List<SerialNumberEx> findById(Long id);
/**
* 通过序列号查询序列号实体信息
* */
List<SerialNumberEx> findBySerialNumber(@Param("serialNumber") String serialNumber);
/**
* 新增序列号信息
* */
@@ -43,20 +27,16 @@ public interface SerialNumberMapperEx {
* 未删除为卖出的视为有效
* */
int findSerialNumberByMaterialId(@Param("materialId") Long materialId);
/**
* 查询符合条件的序列号数量
* */
int countSerialNumberByMaterialIdAndDepotheadId(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId, @Param("isSell")String isSell);
/**
* 卖出： update jsh_serial_number set is_Sell='1' ,depothead_Id='depotheadId' where 1=1 and material_Id='materialId'
* and is_Sell !='1' and delete_Flag !='1' {limit 0，count}
* */
int sellSerialNumber(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId, @Param("snArray") String snArray[], @Param("updateTime") Date updateTime,@Param("updater") Long updater);
int sellSerialNumber(@Param("materialId")Long materialId, @Param("outBillNo")String outBillNo, @Param("snArray") String snArray[], @Param("updateTime") Date updateTime,@Param("updater") Long updater);
/**
* 赎回：update jsh_serial_number set is_Sell='0',depothead_Id=null where 1=1 and material_Id='materialId'
* and depothead_Id='depotheadId' and is_Sell ！='0' and delete_Flag !='1' {limit 0，count}
* */
int cancelSerialNumber(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
int cancelSerialNumber(@Param("materialId")Long materialId, @Param("outBillNo")String outBillNo, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater);
/**
* 批量添加序列号
* */

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -25,6 +25,8 @@ public class DepotHeadVo4List extends DepotHead{
private BigDecimal finishDebt;
private String depotHeadType;
public String getProjectName() {
return projectName;
}
@@ -96,4 +98,12 @@ public class DepotHeadVo4List extends DepotHead{
public void setFinishDebt(BigDecimal finishDebt) {
this.finishDebt = finishDebt;
}
public String getDepotHeadType() {
return depotHeadType;
}
public void setDepotHeadType(String depotHeadType) {
this.depotHeadType = depotHeadType;
}
}