From 955fef9ba80fda70582d926a2c6f2af527447bb5 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 22 十一月 2025 08:21:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocSuppMapper.java | 15 +
src/main/webapp/views/locSupp/locSupp.html | 122 ++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 8
src/main/java/com/zy/common/config/ControllerResAdvice.java | 12
src/main/java/com/zy/common/web/WcsController.java | 4
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 2
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 25 +
src/main/java/com/zy/asrs/service/LocSuppService.java | 10
src/main/java/com/zy/asrs/service/impl/LocSuppServiceImpl.java | 16 +
src/main/java/com/zy/asrs/controller/LocSuppController.java | 125 ++++++++
src/main/webapp/static/js/locSupp/locSupp.js | 261 ++++++++++++++++++
src/main/java/com/zy/asrs/service/ApiLogService.java | 1
src/main/resources/mapper/LocSuppMapper.xml | 19 +
src/main/java/com/zy/asrs/entity/LocSupp.java | 98 +++++++
src/main/resources/application.yml | 4
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 58 ++--
src/main/java/locSupp.sql | 18 +
18 files changed, 761 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocSuppController.java b/src/main/java/com/zy/asrs/controller/LocSuppController.java
new file mode 100644
index 0000000..8262232
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/LocSuppController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.LocSupp;
+import com.zy.asrs.service.LocSuppService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class LocSuppController extends BaseController {
+
+ @Autowired
+ private LocSuppService locSuppService;
+
+ @RequestMapping(value = "/locSupp/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(locSuppService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/locSupp/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<LocSupp> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(LocSupp.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(locSuppService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/locSupp/add/auth")
+ @ManagerAuth
+ public R add(LocSupp locSupp) {
+ locSuppService.insert(locSupp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locSupp/update/auth")
+ @ManagerAuth
+ public R update(LocSupp locSupp){
+ if (Cools.isEmpty(locSupp) || null==locSupp.getId()){
+ return R.error();
+ }
+ locSuppService.updateById(locSupp);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locSupp/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ locSuppService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locSupp/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<LocSupp> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locSupp"));
+ convert(map, wrapper);
+ List<LocSupp> list = locSuppService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/locSuppQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<LocSupp> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<LocSupp> page = locSuppService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (LocSupp locSupp : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", locSupp.getId());
+ map.put("value", locSupp.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/locSupp/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<LocSupp> wrapper = new EntityWrapper<LocSupp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != locSuppService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(LocSupp.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e2e0f5b..5d4837d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -252,7 +252,11 @@
if (Cools.isEmpty(param.getBindingTags())) {
return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
}
- openService.taskArmReport(param);
+ try{
+ openService.taskArmReport(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok();
}
@@ -404,7 +408,7 @@
/**
* 鍒嗘嫞绾夸笂鎶ユ帴鏀�
*/
- @PostMapping("/agv/task/v1")
+ @PostMapping("/agv/task/v1/agvCallback")
@AppAuth(memo = "AGV涓婃姤鎺ユ敹")
public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskAgvReportParam param,
diff --git a/src/main/java/com/zy/asrs/entity/LocSupp.java b/src/main/java/com/zy/asrs/entity/LocSupp.java
new file mode 100644
index 0000000..1087317
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocSupp.java
@@ -0,0 +1,98 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("bas_loc_supp")
+public class LocSupp implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+ private String owner;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * erp渚涘簲鍟嗙紪鍙�
+ */
+ @ApiModelProperty(value= "erp渚涘簲鍟嗙紪鍙�")
+ @TableField("owner_uuid")
+ private String ownerUuid;
+
+ /**
+ * 鐘舵�侊細1鍚� 0鍏�
+ */
+ @ApiModelProperty(value= "鐘舵�侊細1鍚� 0鍏�")
+ private Integer status;
+
+ @ApiModelProperty(value= "")
+ @TableField("owner_type")
+ private Long ownerType;
+
+ @ApiModelProperty(value= "")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ public LocSupp() {}
+
+ public LocSupp(String owner,String ownerUuid,Integer status,Long ownerType,Date createTime,Date updateTime) {
+ this.owner = owner;
+ this.ownerUuid = ownerUuid;
+ this.status = status;
+ this.ownerType = ownerType;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ }
+
+// LocSupp locSupp = new LocSupp(
+// null, // 渚涘簲鍟嗗悕绉癧闈炵┖]
+// null, // erp渚涘簲鍟嗙紪鍙�
+// null, // 鐘舵�侊細1鍚� 0鍏�
+// null, //
+// null, //
+// null //
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocSuppMapper.java b/src/main/java/com/zy/asrs/mapper/LocSuppMapper.java
new file mode 100644
index 0000000..4d6ab4f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/LocSuppMapper.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.entity.LocSupp;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocSuppMapper extends BaseMapper<LocSupp> {
+ LocSupp selectByUuid(@Param("ownerUuid")String ownerUuid);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java
index 43e45d5..1b359e9 100644
--- a/src/main/java/com/zy/asrs/service/ApiLogService.java
+++ b/src/main/java/com/zy/asrs/service/ApiLogService.java
@@ -6,6 +6,7 @@
public interface ApiLogService extends IService<ApiLog> {
void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success);
+ void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success,String memo);
boolean clearWeekBefore();
diff --git a/src/main/java/com/zy/asrs/service/LocSuppService.java b/src/main/java/com/zy/asrs/service/LocSuppService.java
new file mode 100644
index 0000000..8c33a0f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/LocSuppService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.entity.LocSupp;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface LocSuppService extends IService<LocSupp> {
+ LocSupp selectByUuid(String ownerUuid);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
index 30a725f..065c5f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
@@ -44,6 +44,31 @@
}
}
+ @Async
+ @Override
+ public void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success,String memo) {
+ Date now = new Date();
+ ApiLog apiLog = new ApiLog(
+ String.valueOf(snowflakeIdWorker.nextId()), // 鏃ュ織缂栧彿
+ namespace, // 鍚嶇О绌洪棿
+ url, // 鎺ュ彛鍦板潃
+ appkey, // 骞冲彴瀵嗛挜
+ String.valueOf(now.getTime()), // 鏃堕棿鎴�
+ ip, // 瀹㈡埛绔疘P
+ request, // 璇锋眰鍐呭
+ response,
+ null, // 寮傚父鍐呭
+ success?1:0 , // 缁撴灉
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 淇敼鏃堕棿
+ memo // 澶囨敞
+ );
+ if (!this.insert(apiLog)) {
+ log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�");
+ }
+ }
+
@Override
public boolean clearWeekBefore() {
return this.baseMapper.clearWeekBefore() > 0;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocSuppServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocSuppServiceImpl.java
new file mode 100644
index 0000000..ae1ca85
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/LocSuppServiceImpl.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.mapper.LocSuppMapper;
+import com.zy.asrs.entity.LocSupp;
+import com.zy.asrs.service.LocSuppService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locSuppService")
+public class LocSuppServiceImpl extends ServiceImpl<LocSuppMapper, LocSupp> implements LocSuppService {
+ @Override
+ public LocSupp selectByUuid(String ownerUuid) {
+ return this.baseMapper.selectByUuid(ownerUuid);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
index 8931e03..1c68d49 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -18,7 +18,7 @@
@Value("${erp.switch.InboundOrderSwitch}")
private boolean InboundOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
void login(){
if(!InboundOrderSwitch){
return;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 2193811..82cd51a 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -74,6 +74,8 @@
@Autowired
private LocOwnerService locOwnerService;
@Autowired
+ private LocSuppService locSuppService;
+ @Autowired
private ErpSecretServiceImpl erpSecretService;
@Value("${erp.login.accountId}")
private String accountId;
@@ -113,7 +115,7 @@
jsonObject.put("status", Arrays.asList("B", "C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
path = matAddress;
break;
- case "BD_RRGANIZATION": //璐т富鍚屾
+ case "BD_RRGANIZATION": //渚涘簲鍟嗗悓姝�
jsonObject.put("start_createtime", "2025-01-01 00:00:00");//id
jsonObject.put("end_createtime", sdf1.format(now));
jsonObject.put("id", null);
@@ -250,7 +252,7 @@
docTypeService.updateById(docType);
}
}
- else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//璐т富鍚屾
+ else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//渚涘簲鍟嗗悓姝�
int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
int totalPages = (int) Math.ceil((double) totalCount / pageSize);
@@ -276,42 +278,40 @@
String owner = jsonObjectNew.get("name").toString();
Date createTime = sdf1.parse(jsonObjectNew.get("createtime").toString());
// 鐢熸垚鍟嗗搧妗ｆ
- LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
- if (locOwner == null) {
- locOwner = new LocOwner();
- locOwner.setOwner(owner);
- locOwner.setOwnerUuid(ownerUuid);
- locOwner.setCreateTime(createTime);
- locOwner.setUpdateTime(updateTime);
- locOwner.setStatus(1);
- if (!locOwnerService.insert(locOwner)) {
- callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓诲嚭閿欙紒" + locOwner, false);
- log.info("鍚屾鏂拌揣涓诲嚭閿欙紒鍙傛暟锛歔{}]銆乕{}]", locOwner, jsonObjectNew);
+ LocSupp locSupp = locSuppService.selectByUuid(ownerUuid);
+ if (locSupp == null) {
+ locSupp = new LocSupp();
+ locSupp.setOwner(owner);
+ locSupp.setOwnerUuid(ownerUuid);
+ locSupp.setCreateTime(createTime);
+ locSupp.setUpdateTime(updateTime);
+ locSupp.setStatus(1);
+ if (!locSuppService.insert(locSupp)) {
+ callApiLogSaveSupp(locSupp, kingDeeUtilType, "鍚屾鏂颁緵搴斿晢鍑洪敊锛�" + locSupp, false);
+ log.info("鍚屾鏂颁緵搴斿晢鍑洪敊锛佸弬鏁帮細[{}]銆乕{}]", locSupp, jsonObjectNew);
} else {
- callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓绘垚鍔燂紒", true);
- success = true;
+ callApiLogSaveSupp(locSupp, kingDeeUtilType, "鍚屾鏂颁緵搴斿晢鎴愬姛锛�", true);
}
} else {
boolean isUpdated = false;
- if (locOwner.getUpdateTime().compareTo(updateTime) != 0) {
+ if (locSupp.getUpdateTime().compareTo(updateTime) != 0) {
// 鏇存柊瀛楁
- if (!locOwner.getOwner().equals(owner)) locOwner.setOwner(owner);
- if (!locOwner.getOwnerUuid().equals(ownerUuid)) locOwner.setOwnerUuid(ownerUuid);
+ if (!locSupp.getOwner().equals(owner)) locSupp.setOwner(owner);
+ if (!locSupp.getOwnerUuid().equals(ownerUuid)) locSupp.setOwnerUuid(ownerUuid);
- if (locOwner.getCreateTime().compareTo(createTime) != 0)
- locOwner.setCreateTime(createTime);
- locOwner.setUpdateTime(updateTime);
+ if (locSupp.getCreateTime().compareTo(createTime) != 0)
+ locSupp.setCreateTime(createTime);
+ locSupp.setUpdateTime(updateTime);
isUpdated = true;
}
// 鎵ц鏇存柊鎿嶄綔
if (isUpdated) {
- if (!locOwnerService.updateById(locOwner)) {
- callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鍑洪敊锛�" + locOwner, false);
- log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}], 鏇存柊澶辫触锛�", locOwner.getOwnerUuid());
+ if (!locSuppService.updateById(locSupp)) {
+ callApiLogSaveSupp(locSupp, kingDeeUtilType, "鏇存柊渚涘簲鍟嗗嚭閿欙紒" + locSupp, false);
+ log.info("鏇存柊渚涘簲鍟哰渚涘簲鍟嗙紪鍙凤細{}], 鏇存柊澶辫触锛�", locSupp.getOwnerUuid());
} else {
- callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鎴愬姛锛�", true);
- success = true;
- log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}]", locOwner.getOwnerUuid());
+ callApiLogSaveSupp(locSupp, kingDeeUtilType, "鏇存柊渚涘簲鍟嗘垚鍔燂紒", true);
+ log.info("鏇存柊渚涘簲鍟哰渚涘簲鍟嗙紪鍙凤細{}]", locSupp.getOwnerUuid());
}
}
}
@@ -456,9 +456,9 @@
response, bool);
}
- public void callApiLogSaveOwner(LocOwner locOwner, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
+ public void callApiLogSaveSupp(LocSupp locSupp, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "璐т富缂栧彿锛�" + locOwner.getOwnerUuid() + "銆佽揣涓诲悕绉帮細" + locOwner.getOwner(),
+ "璐т富缂栧彿锛�" + locSupp.getOwnerUuid() + "銆佽揣涓诲悕绉帮細" + locSupp.getOwner(),
response, bool);
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 4714c5b..bcf969f 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
generator.url="10.10.10.235:1433;databasename=jshdasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="bas_loc_owner";
+ generator.table="bas_loc_supp";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/config/ControllerResAdvice.java b/src/main/java/com/zy/common/config/ControllerResAdvice.java
index 4f603c4..3661d36 100644
--- a/src/main/java/com/zy/common/config/ControllerResAdvice.java
+++ b/src/main/java/com/zy/common/config/ControllerResAdvice.java
@@ -1,6 +1,7 @@
package com.zy.common.config;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
@@ -82,10 +83,16 @@
public void beforeBodyWriteCallApiLogSave(String name, String url, String appkey, String ip, String request, String response, boolean success) {
ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ String memo = response;
+ try{
+ JSONObject reqJson = JSONObject.parseObject(request);
+ memo = reqJson.getString("staNo"); // 鎻愬彇 staNo
+ } catch (Exception e){
+ }
ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>()
.eq("namespace", name)
- .eq("response", response)
+ .eq("memo", memo)
.eq("result", success? 1:0)
.orderBy("create_time", false)
);
@@ -104,7 +111,8 @@
ip,
request,
response,
- success
+ success,
+ memo
);
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4a5b5bc..e4e7a12 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -131,7 +131,7 @@
}
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-
+ param.setIoType(10);
StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
@@ -364,7 +364,7 @@
@Transactional
public StartupDto startupFullPutStoreAgv(Integer devpNo, String barcode, LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
diff --git a/src/main/java/locSupp.sql b/src/main/java/locSupp.sql
new file mode 100644
index 0000000..a71b231
--- /dev/null
+++ b/src/main/java/locSupp.sql
@@ -0,0 +1,18 @@
+-- save locSupp record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp/locSupp.html', 'locSupp绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'locSupp#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp/locSupp.html', N'locSupp绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'locSupp#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fb3133a..719aa5c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -92,7 +92,7 @@
# 寮�鍏�
switch:
#璁℃椂鍣ㄤ笂鎶ュ紑鍏�
- ErpReportOld: false
+ ErpReportOld: true
#鑾峰彇鍗曟嵁寮�鍏�
InboundOrderSwitch: false
#鐧诲綍鎺ュ彛寮�鍏�
@@ -101,7 +101,7 @@
ReviewOrderSwitch: false
# 鍦板潃
address:
- URL: https://shyucheng.test.kdgalaxy.com/
+ URL: https://shyucheng.test.kdgalaxy.com
#鐧诲綍鍦板潃
loginaddress: /kapi/oauth2/getToken
#鍟嗗搧妗ｆ鍦板潃
diff --git a/src/main/resources/mapper/LocSuppMapper.xml b/src/main/resources/mapper/LocSuppMapper.xml
new file mode 100644
index 0000000..9757c84
--- /dev/null
+++ b/src/main/resources/mapper/LocSuppMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.LocSuppMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocSupp">
+ <result column="owner" property="owner" />
+ <result column="id" property="id" />
+ <result column="owner_uuid" property="ownerUuid" />
+ <result column="status" property="status" />
+ <result column="owner_type" property="ownerType" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+
+ </resultMap>
+ <select id="selectByUuid" resultMap="BaseResultMap">
+ select top 1 * from bas_loc_supp where 1=1 and owner_uuid = #{ownerUuid}
+ </select>
+</mapper>
diff --git a/src/main/webapp/static/js/locSupp/locSupp.js b/src/main/webapp/static/js/locSupp/locSupp.js
new file mode 100644
index 0000000..f858b49
--- /dev/null
+++ b/src/main/webapp/static/js/locSupp/locSupp.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#locSupp',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locSupp/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'owner', align: 'center',title: '渚涘簲鍟嗗悕绉�'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'ownerUuid', align: 'center',title: 'erp渚涘簲鍟嗙紪鍙�'}
+ ,{field: 'status', align: 'center',title: '鐘舵�侊細1鍚� 0鍏�',hide:true}
+ ,{field: 'ownerType', align: 'center',title: ''}
+ ,{field: 'createTime$', align: 'center',title: ''}
+ ,{field: 'updateTime$', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locSupp)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(locSupp)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'locSupp': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/locSupp/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(locSupp)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/locSupp/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/locSupp/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/locSupp/locSupp.html b/src/main/webapp/views/locSupp/locSupp.html
new file mode 100644
index 0000000..0ba57b1
--- /dev/null
+++ b/src/main/webapp/views/locSupp/locSupp.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="locSupp" lay-filter="locSupp"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locSupp/locSupp.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">渚涘簲鍟嗗悕绉�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="owner" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">erp渚涘簲鍟嗙紪鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ownerUuid" placeholder="璇疯緭鍏rp渚涘簲鍟嗙紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵�侊細1鍚� 0鍏�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="status" placeholder="璇疯緭鍏ョ姸鎬侊細1鍚� 0鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="ownerType" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1