admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
pengjie 2024-04-30 18:19:08 +08:00
parent 38cd067631
commit ab2bb2f621
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.xz.controller; package com.zhgd.xmgl.modules.xz.controller;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@ -163,10 +164,26 @@ public class XzMaterialController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
public Result<Object> save(@RequestBody JSONObject obj) { public Result<Object> save(@RequestBody JSONObject obj) {
log.info("添加材料信息" + JSON.toJSONString(obj)); log.info("添加材料信息" + JSON.toJSONString(obj));
List<String> enterpriseIds = (List<String>) obj.get("enterpriseId");
XzMaterial xzMaterial = new XzMaterial(); XzMaterial xzMaterial = new XzMaterial();
String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; String [] param = {"name", "model", "specifications", "unit", "num", "remark"};
List<XzMaterialDetail> list = new ArrayList<>(); List<XzMaterialDetail> list = new ArrayList<>();
xzMaterial.setName(obj.getString("name")); XzMaterial exist = xzMaterialService.getOne(Wrappers.<XzMaterial>lambdaQuery()
.like(XzMaterial::getName, DateUtil.today())
.orderByDesc(XzMaterial::getCreateTime).last("limit 1"));
if (exist == null) {
xzMaterial.setName(DateUtil.today() + "/01批次");
xzMaterial.setNum(1);
} else {
Integer index = exist.getNum();
index = index + 1;
if (index < 10) {
xzMaterial.setName(DateUtil.today() + "/第0" + index + "批次");
} else {
xzMaterial.setName(DateUtil.today() + "/第" + index + "批次");
}
xzMaterial.setNum(index);
}
xzMaterial.setEntryTime(obj.getDate("entryTime")); xzMaterial.setEntryTime(obj.getDate("entryTime"));
JSONArray detail = obj.getJSONArray("detail"); JSONArray detail = obj.getJSONArray("detail");
if (detail != null) { if (detail != null) {
@ -183,11 +200,11 @@ public class XzMaterialController {
} }
} }
xzMaterial.setProjectSn(obj.getString("projectSn")); xzMaterial.setProjectSn(obj.getString("projectSn"));
List<String> enterpriseIds = (List<String>) obj.get("enterpriseId"); if (enterpriseIds != null && enterpriseIds.size() > 0) {
if (enterpriseIds != null && enterpriseIds.size() >0) {
xzMaterial.setEnterpriseId(enterpriseIds.get(0)); xzMaterial.setEnterpriseId(enterpriseIds.get(0));
} }
xzMaterial.setXzMaterialList(list); xzMaterial.setXzMaterialList(list);
xzMaterial.setCreateTime(new Date());
xzMaterialService.saveInfo(xzMaterial); xzMaterialService.saveInfo(xzMaterial);
return Result.success("添加成功！"); return Result.success("添加成功！");
} }

9
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
View File

@ -39,6 +39,12 @@ public class XzMaterial implements Serializable {
@Excel(name = "批次名称", width = 15) @Excel(name = "批次名称", width = 15)
@ApiModelProperty(value = "批次名称") @ApiModelProperty(value = "批次名称")
private String name; private String name;
/**
* 批次数量
*/
@Excel(name = "批次数量", width = 15)
@ApiModelProperty(value = "批次数量")
private Integer num;
/** /**
* 入场时间 * 入场时间
*/ */
@ -58,6 +64,9 @@ public class XzMaterial implements Serializable {
@ApiModelProperty(value = "企业id") @ApiModelProperty(value = "企业id")
private String enterpriseId; private String enterpriseId;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
private String enterpriseName; private String enterpriseName;