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

给商品扩展表增加‘是否默认基础单位’字段

Browse Source
This commit is contained in:
季圣华
2020-04-25 11:39:16 +08:00
parent 2965a441b7
commit 5774580b0b
9 changed files with 630 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java
View File

@@ -20,6 +20,8 @@ public class MaterialExtend {
private BigDecimal lowDecimal;
private String defaultFlag;
private Date createTime;
private String createSerial;
@@ -96,6 +98,14 @@ public class MaterialExtend {
this.lowDecimal = lowDecimal;
}
public String getDefaultFlag() {
return defaultFlag;
}
public void setDefaultFlag(String defaultFlag) {
this.defaultFlag = defaultFlag == null ? null : defaultFlag.trim();
}
public Date getCreateTime() {
return createTime;
}

70
src/main/java/com/jsh/erp/datasource/entities/MaterialExtendExample.java
View File

@@ -606,6 +606,76 @@ public class MaterialExtendExample {
return (Criteria) this;
}
public Criteria andDefaultFlagIsNull() {
addCriterion("default_flag is null");
return (Criteria) this;
}
public Criteria andDefaultFlagIsNotNull() {
addCriterion("default_flag is not null");
return (Criteria) this;
}
public Criteria andDefaultFlagEqualTo(String value) {
addCriterion("default_flag =", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagNotEqualTo(String value) {
addCriterion("default_flag <>", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagGreaterThan(String value) {
addCriterion("default_flag >", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagGreaterThanOrEqualTo(String value) {
addCriterion("default_flag >=", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagLessThan(String value) {
addCriterion("default_flag <", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagLessThanOrEqualTo(String value) {
addCriterion("default_flag <=", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagLike(String value) {
addCriterion("default_flag like", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagNotLike(String value) {
addCriterion("default_flag not like", value, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagIn(List<String> values) {
addCriterion("default_flag in", values, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagNotIn(List<String> values) {
addCriterion("default_flag not in", values, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagBetween(String value1, String value2) {
addCriterion("default_flag between", value1, value2, "defaultFlag");
return (Criteria) this;
}
public Criteria andDefaultFlagNotBetween(String value1, String value2) {
addCriterion("default_flag not between", value1, value2, "defaultFlag");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;

41
src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java
View File

@@ -75,7 +75,7 @@ public class MaterialExtendService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public String saveDetials(String inserted, String deleted, String updated,Long materialId) throws Exception {
public String saveDetials(String inserted, String deleted, String updated, String sortList, Long materialId) throws Exception {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
logService.insertLog("商品价格扩展",
BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
@@ -83,6 +83,7 @@ public class MaterialExtendService {
JSONArray insertedJson = JSONArray.parseArray(inserted);
JSONArray deletedJson = JSONArray.parseArray(deleted);
JSONArray updatedJson = JSONArray.parseArray(updated);
JSONArray sortJson = JSONArray.parseArray(sortList);
if (null != insertedJson) {
for (int i = 0; i < insertedJson.size(); i++) {
MaterialExtend materialExtend = new MaterialExtend();
@@ -143,7 +144,39 @@ public class MaterialExtendService {
if (StringUtils.isNotEmpty(tempUpdatedJson.getString("LowDecimal"))) {
materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("LowDecimal"));
}
this.updateMaterialExtend(materialExtend, request);
this.updateMaterialExtend(materialExtend);
}
}
//处理条码的排序，基础单位排第一个
if (null != sortJson && sortJson.size()>0) {
//此处为更新的逻辑
for (int i = 0; i < sortJson.size(); i++) {
JSONObject tempSortJson = JSONObject.parseObject(sortJson.getString(i));
MaterialExtend materialExtend = new MaterialExtend();
if(StringUtil.isExist(tempSortJson.get("id"))) {
materialExtend.setId(tempSortJson.getLong("id"));
}
if(StringUtil.isExist(tempSortJson.get("defaultFlag"))) {
materialExtend.setDefaultFlag(tempSortJson.getString("defaultFlag"));
}
this.updateMaterialExtend(materialExtend);
}
} else {
//新增的时候将第一条记录设置为默认基础单位
MaterialExtendExample example = new MaterialExtendExample();
example.createCriteria().andMaterialIdEqualTo(materialId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<MaterialExtend> meList = materialExtendMapper.selectByExample(example);
if(meList!=null) {
for(int i=0; i<meList.size(); i++) {
MaterialExtend materialExtend = new MaterialExtend();
materialExtend.setId(meList.get(i).getId());
if(i==0) {
materialExtend.setDefaultFlag("1"); //默认
} else {
materialExtend.setDefaultFlag("0"); //非默认
}
this.updateMaterialExtend(materialExtend);
}
}
}
return null;
@@ -167,9 +200,9 @@ public class MaterialExtendService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateMaterialExtend(MaterialExtend MaterialExtend, HttpServletRequest request) throws Exception{
public int updateMaterialExtend(MaterialExtend MaterialExtend) throws Exception{
User user = userService.getCurrentUser();
MaterialExtend.setUpdateTime(new Date().getTime());
MaterialExtend.setUpdateTime(System.currentTimeMillis());
MaterialExtend.setUpdateSerial(user.getLoginName());
int res =0;
try{

4
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -157,7 +157,7 @@ public class MaterialService {
mId = materials.get(0).getId();
}
JSONObject mObj = JSON.parseObject(beanJson);
materialExtendService.saveDetials(mObj.getString("inserted"), mObj.getString("deleted"), mObj.getString("updated"), mId);
materialExtendService.saveDetials(mObj.getString("inserted"), mObj.getString("deleted"), mObj.getString("updated"),mObj.getString("sortList"), mId);
if(mObj.get("stock")!=null) {
String stockStr = mObj.getString("stock");
JSONArray stockArr = JSONArray.parseArray(stockStr);
@@ -193,7 +193,7 @@ public class MaterialService {
materialMapperEx.updateUnitIdNullByPrimaryKey(id); //将多单位置空
}
JSONObject mObj = JSON.parseObject(beanJson);
materialExtendService.saveDetials(mObj.getString("inserted"),mObj.getString("deleted"),mObj.getString("updated"),id);
materialExtendService.saveDetials(mObj.getString("inserted"),mObj.getString("deleted"),mObj.getString("updated"),mObj.getString("sortList"),id);
if(mObj.get("stock")!=null) {
String stockStr = mObj.getString("stock");
JSONArray stockArr = JSONArray.parseArray(stockStr);