root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gongbaoxiong
2024-11-29 10:04:53 +08:00
parent 704c89fda8 52a5f8912c
commit 56400375b0
9 changed files with 1017 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/CodeUtil.java
View File

@@ -16,7 +16,7 @@ public class CodeUtil {
final String[] code = {""};
ISysCodeRuleService service = SpringContextHolder.getBean(ISysCodeRuleService.class);
RedissonUtils.lock(() ->
code[0] = service.codeDemo("1",ruleCode), ruleCode, 2);
code[0] = service.codeDemo("1",ruleCode), ruleCode, 3);
return code[0];
}
public static String codeView(String ruleCode) {

18
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
View File

@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.constant.DictConstantPool;
@@ -111,7 +112,22 @@ public class BmFormStrucController {
@GetMapping("/getParentFormTypes")
public ResponseEntity<Object> getParentFormTypes(){
//参数判读，参数解析，调用参数入库
List<Map<String, Object>> select = iBmFormStrucService.listMaps(new QueryWrapper<BmFormStruc>().select("form_type", "form_name").isNull("parent_id").groupBy("form_type"));
QueryWrapper<BmFormStruc> queryWrapper = new QueryWrapper<BmFormStruc>().select("form_type", "form_name").isNull("parent_id").groupBy("form_type");
List<Map<String, Object>> select = iBmFormStrucService.listMaps(queryWrapper);
List<Map> list = new ArrayList<>();
for (Map<String, Object> map : select) {
list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type")));
}
return new ResponseEntity<>(list,HttpStatus.OK);
}
@GetMapping("/getParentFormTypes/{desc}")
public ResponseEntity<Object> getParentFormTypes(@PathVariable String desc){
//参数判读，参数解析，调用参数入库
QueryWrapper<BmFormStruc> queryWrapper = new QueryWrapper<BmFormStruc>().select("form_type", "form_name").isNull("parent_id").groupBy("form_type");
if (StringUtils.isNotEmpty(desc)){
queryWrapper.eq("form_desc",desc);
}
List<Map<String, Object>> select = iBmFormStrucService.listMaps(queryWrapper);
List<Map> list = new ArrayList<>();
for (Map<String, Object> map : select) {
list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type")));

11
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java
View File

@@ -148,6 +148,17 @@ public class MappingHandler extends TypeHandler<JSONObject, JSONObject> {
}
value = valueMap;
}
if (valueStruc instanceof List){
Object item = ((List<?>) valueStruc).get(0);
Map<String, Object> valueMap = new HashMap<>();
Map<String,Object> valueStrucMap = (Map) item;
for (String innerKey : valueStrucMap.keySet()) {
Object innerValueStruc = valueStrucMap.get(innerKey);
Object innerValue = this.velueMapping(sourceFormData, innerKey, innerValueStruc, formDataMapping);
valueMap.put(innerKey,innerValue);
}
value = ListOf.of(valueMap);
}
return value;
}

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
View File

@@ -2,8 +2,11 @@ package org.nl.wms.system_manage.service.quartz.task;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.kingdee.bos.webapi.entity.*;
import com.kingdee.bos.webapi.sdk.K3CloudApi;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.BaseCode;
@@ -59,6 +62,7 @@ public class SyncErpBillsScheduleService {
}
}
/**
*
*/
@@ -109,7 +113,9 @@ public class SyncErpBillsScheduleService {
log.error("ERP单据同步同步失败:{}", error);
}
for (Object r : result) {
List<PmFormData> pmFormDatas = formDataService.syncAnalyse(syncFormMapping, JSON.toJSONString(r));
String syncMappingString = JSON.toJSONString(syncFormMapping);
SyncFormMapping cloneMapping = JSON.parseObject(syncMappingString, SyncFormMapping.class);
List<PmFormData> pmFormDatas = formDataService.syncAnalyse(cloneMapping, JSON.toJSONString(r));
formDataService.saveBatch(pmFormDatas);
}
}
@@ -122,5 +128,4 @@ public class SyncErpBillsScheduleService {
}
}
}
}