文件上传、token过期监控修改、养生区成品区代码修改、easyExcel
This commit is contained in:
@@ -71,5 +71,13 @@ public class StructivtController {
|
||||
structivtService.outInventory(jsonArray);
|
||||
return new ResponseEntity<>(HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@PostMapping("/batchEdit")
|
||||
@Log("批量修改")
|
||||
@ApiOperation("批量修改")
|
||||
public ResponseEntity<Object> batchEdit(@RequestBody JSONArray datas){
|
||||
structivtService.batchEdit(datas);
|
||||
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -68,5 +68,11 @@ public interface StructivtService {
|
||||
* @param jsonArray
|
||||
*/
|
||||
void outInventory(JSONArray jsonArray);
|
||||
|
||||
/**
|
||||
* 批量修改
|
||||
* @param datas
|
||||
*/
|
||||
void batchEdit(JSONArray datas);
|
||||
}
|
||||
|
||||
|
||||
@@ -43,12 +43,15 @@ public class StructivtServiceImpl implements StructivtService {
|
||||
|
||||
@Override
|
||||
public Map<String,Object> queryAll(Map whereJson, Pageable page){
|
||||
JSONObject map = new JSONObject();
|
||||
JSONObject map = new JSONObject();
|
||||
map.put("flag", "1");
|
||||
map.put("region_code", "(" + whereJson.get("region_code") + ")");
|
||||
if (!ObjectUtil.isNull(whereJson.get("point_code"))) {
|
||||
map.put("point_code", "%" + whereJson.get("point_code") + "%");
|
||||
}
|
||||
if (!ObjectUtil.isNull(whereJson.get("material_code"))) {
|
||||
map.put("material_code", "%" + whereJson.get("material_code") + "%");
|
||||
}
|
||||
map.put("layer_num", whereJson.get("layer_num"));
|
||||
map.put("row_num", whereJson.get("row_num"));
|
||||
map.put("col_num", whereJson.get("col_num"));
|
||||
@@ -71,6 +74,16 @@ public class StructivtServiceImpl implements StructivtService {
|
||||
statusMap.put(status[0], status[1]);
|
||||
}
|
||||
cppEntry.put("point_status_name", statusMap.getString(cppEntry.getString("point_status")));
|
||||
// 获取物料信息
|
||||
String materialId = cppEntry.getString("material_id");
|
||||
if (ObjectUtil.isNotEmpty(materialId)) {
|
||||
WQLObject md_me_materialBase = WQLObject.getWQLObject("MD_ME_MaterialBase");
|
||||
JSONObject jsonObject = md_me_materialBase.query("material_id = '" + materialId + "'").uniqueResult(0);
|
||||
if (ObjectUtil.isNotEmpty(jsonObject)) {
|
||||
cppEntry.put("material_code", jsonObject.getString("material_code"));
|
||||
cppEntry.put("material_name", jsonObject.getString("material_name"));
|
||||
}
|
||||
}
|
||||
res.add(cppEntry);
|
||||
}
|
||||
json.put("content", res);
|
||||
@@ -274,4 +287,68 @@ public class StructivtServiceImpl implements StructivtService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量修改
|
||||
*
|
||||
* @param datas
|
||||
*/
|
||||
@Override
|
||||
public void batchEdit(JSONArray datas) {
|
||||
Long currentUserId = SecurityUtils.getCurrentUserId();
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
System.out.println(datas);
|
||||
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
|
||||
WQLObject structIvtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
|
||||
WQLObject materialBaseTab = WQLObject.getWQLObject("MD_ME_MaterialBase");
|
||||
for ( int i = 0; i < datas.size(); i++ ) {
|
||||
JSONObject object = datas.getJSONObject(i);
|
||||
// 根据物料material_code查找物料信息
|
||||
String material_id = null;
|
||||
String material_code = object.getString("material_code");
|
||||
if (ObjectUtil.isNotEmpty(material_code)) {
|
||||
JSONObject materialObj = materialBaseTab.query("material_code = '" + material_code + "'").uniqueResult(0);
|
||||
if (ObjectUtil.isNotEmpty(materialObj)) {
|
||||
material_id = materialObj.getString("material_id");
|
||||
} else {
|
||||
throw new BadRequestException("物料编码出错");
|
||||
}
|
||||
}
|
||||
JSONObject points = pointTab.query("point_id = '" + object.getString("point_id") + "'").uniqueResult(0);
|
||||
if (ObjectUtil.isNotEmpty(points)) {
|
||||
points.put("point_status", object.getString("point_status"));
|
||||
points.put("lock_type", object.getString("lock_type"));
|
||||
points.put("vehicle_type", object.getString("vehicle_type"));
|
||||
points.put("is_used", object.getString("is_used"));
|
||||
points.put("update_optid", currentUserId);
|
||||
points.put("update_optname", nickName);
|
||||
points.put("update_time", now);
|
||||
points.put("material_id", material_id);
|
||||
pointTab.update(points);
|
||||
}
|
||||
// 修改/新增 仓位库存表【ST_IVT_StructIvt】
|
||||
String stockrecordId = object.getString("stockrecord_id");
|
||||
if (ObjectUtil.isNotEmpty(stockrecordId)) {
|
||||
// 修改
|
||||
JSONObject strObject = structIvtTab.query("stockrecord_id = '" + stockrecordId + "'").uniqueResult(0);
|
||||
strObject.put("ivt_qty", object.getString("ivt_qty"));
|
||||
strObject.put("material_id", points.getString("material_id"));
|
||||
structIvtTab.update(strObject);
|
||||
} else {
|
||||
// 新增
|
||||
JSONObject str = new JSONObject();
|
||||
str.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId());
|
||||
str.put("point_id", points.getString("point_id"));
|
||||
str.put("point_code", points.getString("point_code"));
|
||||
str.put("point_name", points.getString("point_name"));
|
||||
str.put("region_id", points.getString("region_id"));
|
||||
str.put("region_code", points.getString("region_code"));
|
||||
str.put("region_name", points.getString("region_name"));
|
||||
str.put("material_id", points.getString("material_id"));
|
||||
str.put("ivt_qty", object.getString("ivt_qty"));
|
||||
structIvtTab.insert(str);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
输入.bill_status TYPEAS s_string
|
||||
输入.io_type TYPEAS s_string
|
||||
输入.lock_type TYPEAS s_string
|
||||
输入.material_code TYPEAS s_string
|
||||
输入.point_status TYPEAS s_string
|
||||
输入.vehicle_type TYPEAS s_string
|
||||
输入.is_used TYPEAS s_string
|
||||
|
||||
|
||||
[临时表]
|
||||
@@ -48,17 +52,16 @@
|
||||
IF 输入.flag = "1"
|
||||
PAGEQUERY
|
||||
SELECT
|
||||
str.*,
|
||||
point.vehicle_type,
|
||||
point.layer_num,
|
||||
point.row_num,
|
||||
point.col_num,
|
||||
point.is_used,
|
||||
point.lock_type,
|
||||
point.point_status
|
||||
point.*,
|
||||
str.stockrecord_id,
|
||||
str.pcsn,
|
||||
str.ivt_qty,
|
||||
str.qty_unit_id,
|
||||
str.instorage_time,
|
||||
str.standing_time
|
||||
FROM
|
||||
st_ivt_structivt str
|
||||
LEFT JOIN sch_base_point point ON str.point_id = point.point_id
|
||||
sch_base_point point
|
||||
LEFT JOIN st_ivt_structivt str ON str.point_id = point.point_id
|
||||
WHERE
|
||||
point.region_code IN 输入.region_code
|
||||
OPTION 输入.point_code <> ""
|
||||
@@ -70,6 +73,11 @@
|
||||
OPTION 输入.vehicle_type <> ""
|
||||
point.vehicle_type = 输入.vehicle_type
|
||||
ENDOPTION
|
||||
OPTION 输入.material_code <> ""
|
||||
point.material_id IN (
|
||||
SELECT material_code FROM md_me_materialbase WHERE material_code LIKE 输入.material_code
|
||||
)
|
||||
ENDOPTION
|
||||
OPTION 输入.layer_num <> ""
|
||||
point.layer_num = 输入.layer_num
|
||||
ENDOPTION
|
||||
|
||||
Reference in New Issue
Block a user