From 30f88b2cd1aec5b1b009def619e90145e9788284 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 05 九月 2025 14:30:56 +0800
Subject: [PATCH] #中间表
---
src/main/resources/mapper/ICMOMapper.xml | 139 +++++
src/main/java/com/zy/asrs/service/ICMOService.java | 10
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 180 +++---
src/main/java/com/zy/asrs/utils/ERPDateUtils.java | 24
src/main/webapp/views/erpReceiving/erpReceiving.html | 32
src/main/java/com/zy/asrs/mapper/ICMOMapper.java | 12
pom.xml | 5
src/main/java/com/zy/common/CodeBuilder.java | 7
src/main/java/com/zy/asrs/entity/ICMO.java | 953 ++++++++++++++++++++++++++++++++++++
src/main/java/iCMO.sql | 18
src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java | 14
src/main/java/com/zy/asrs/controller/ICMOController.java | 131 +++++
src/main/resources/application.yml | 17
13 files changed, 1,430 insertions(+), 112 deletions(-)
diff --git a/pom.xml b/pom.xml
index b7bd3f6..12e558c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,11 @@
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/apigwclient-0.1.5.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <version>4.2.0</version>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>kingdee-xw-openapi</groupId>-->
<!-- <artifactId>kingdee-xw-openapi</artifactId>-->
diff --git a/src/main/java/com/zy/asrs/controller/ICMOController.java b/src/main/java/com/zy/asrs/controller/ICMOController.java
new file mode 100644
index 0000000..ff58840
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ICMOController.java
@@ -0,0 +1,131 @@
+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.ICMO;
+import com.zy.asrs.service.ICMOService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.utils.ERPDateUtils;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+@RestController
+public class ICMOController extends BaseController {
+
+ @Autowired
+ private ICMOService iCMOService;
+
+ @RequestMapping(value = "/iCMO/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(iCMOService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/iCMO/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){
+ if (!Cools.isEmpty(param.get("FPlanCommitDate"))){
+ param.put("FPlanCommitDate", ERPDateUtils.getERPFiltterDate(param.get("FPlanCommitDate").toString()));
+ }
+ EntityWrapper<ICMO> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(ICMO.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(iCMOService.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 = "/iCMO/add/auth")
+ @ManagerAuth
+ public R add(ICMO iCMO) {
+ iCMOService.insert(iCMO);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/iCMO/update/auth")
+ @ManagerAuth
+ public R update(ICMO iCMO){
+ if (Cools.isEmpty(iCMO) || null==iCMO.getFInterID()){
+ return R.error();
+ }
+ iCMOService.updateById(iCMO);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/iCMO/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ iCMOService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/iCMO/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<ICMO> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("iCMO"));
+ convert(map, wrapper);
+ List<ICMO> list = iCMOService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/iCMOQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<ICMO> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<ICMO> page = iCMOService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ICMO iCMO : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", iCMO.getFInterID());
+ map.put("value", iCMO.getFInterID());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/iCMO/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<ICMO> wrapper = new EntityWrapper<ICMO>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != iCMOService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(ICMO.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/ICMO.java b/src/main/java/com/zy/asrs/entity/ICMO.java
new file mode 100644
index 0000000..a9e0f9d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/ICMO.java
@@ -0,0 +1,953 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableField;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("ICMO")
+public class ICMO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableField("FBrNo")
+ private String FBrNo;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "FInterID", type = IdType.INPUT)
+ @TableField("FInterID")
+ private Integer FInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FBillNo")
+ private String FBillNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("FTranType")
+ private Short FTranType;
+
+ @ApiModelProperty(value= "")
+ @TableField("FStatus")
+ private Short FStatus;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMRP")
+ private Short FMRP;
+
+ @ApiModelProperty(value= "")
+ @TableField("FType")
+ private Short FType;
+
+ @ApiModelProperty(value= "")
+ @TableField("FWorkShop")
+ private Integer FWorkShop;
+
+ @ApiModelProperty(value= "")
+ @TableField("FItemID")
+ private Integer FItemID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQty")
+ private Double FQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCommitQty")
+ private Double FCommitQty;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FPlanCommitDate")
+ private Date FPlanCommitDate;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FPlanFinishDate")
+ private Date FPlanFinishDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FConveyerID")
+ private Integer FConveyerID;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FCommitDate")
+ private Date FCommitDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCheckerID")
+ private Integer FCheckerID;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FCheckDate")
+ private Date FCheckDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FRequesterID")
+ private Integer FRequesterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FBillerID")
+ private Integer FBillerID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSourceEntryID")
+ private Integer FSourceEntryID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FClosed")
+ private Short FClosed;
+
+ @ApiModelProperty(value= "")
+ @TableField("FNote")
+ private String FNote;
+
+ @ApiModelProperty(value= "")
+ @TableField("FUnitID")
+ private Integer FUnitID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxCommitQty")
+ private Double FAuxCommitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQty")
+ private Double FAuxQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FOrderInterID")
+ private Integer FOrderInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPPOrderInterID")
+ private Integer FPPOrderInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FParentInterID")
+ private Integer FParentInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCancellation")
+ private Boolean FCancellation;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSupplyID")
+ private Integer FSupplyID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyFinish")
+ private Double FQtyFinish;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyScrap")
+ private Double FQtyScrap;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyForItem")
+ private Double FQtyForItem;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyLost")
+ private Double FQtyLost;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FPlanIssueDate")
+ private Date FPlanIssueDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FRoutingID")
+ private String FRoutingID;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FStartDate")
+ private Date FStartDate;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FFinishDate")
+ private Date FFinishDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyFinish")
+ private Double FAuxQtyFinish;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyScrap")
+ private Double FAuxQtyScrap;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyForItem")
+ private Double FAuxQtyForItem;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyLost")
+ private Double FAuxQtyLost;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMrpClosed")
+ private Integer FMrpClosed;
+
+ @ApiModelProperty(value= "")
+ @TableField("FBomInterID")
+ private Integer FBomInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyPass")
+ private Double FQtyPass;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyPass")
+ private Double FAuxQtyPass;
+
+ @ApiModelProperty(value= "")
+ @TableField("FQtyBack")
+ private Double FQtyBack;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxQtyBack")
+ private Double FAuxQtyBack;
+
+ @ApiModelProperty(value= "")
+ @TableField("FFinishTime")
+ private Double FFinishTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FReadyTIme")
+ private Double FReadyTIme;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPowerCutTime")
+ private Double FPowerCutTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FFixTime")
+ private Double FFixTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FWaitItemTime")
+ private Double FWaitItemTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FWaitToolTime")
+ private Double FWaitToolTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FTaskID")
+ private Integer FTaskID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FWorkTypeID")
+ private Integer FWorkTypeID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCostObjID")
+ private Integer FCostObjID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FStockQty")
+ private Double FStockQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxStockQty")
+ private Double FAuxStockQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSuspend")
+ private Boolean FSuspend;
+
+ @ApiModelProperty(value= "")
+ @TableField("FProjectNO")
+ private Integer FProjectNO;
+
+ @ApiModelProperty(value= "")
+ @TableField("FProductionLineID")
+ private Integer FProductionLineID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FReleasedQty")
+ private Double FReleasedQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FReleasedAuxQty")
+ private Double FReleasedAuxQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FUnScheduledQty")
+ private Double FUnScheduledQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FUnScheduledAuxQty")
+ private Double FUnScheduledAuxQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSubEntryID")
+ private Integer FSubEntryID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FScheduleID")
+ private Integer FScheduleID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPlanOrderInterID")
+ private Integer FPlanOrderInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FProcessPrice")
+ private Double FProcessPrice;
+
+ @ApiModelProperty(value= "")
+ @TableField("FProcessFee")
+ private Double FProcessFee;
+
+ @ApiModelProperty(value= "")
+ @TableField("FGMPBatchNo")
+ private String FGMPBatchNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("FGMPCollectRate")
+ private Double FGMPCollectRate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FGMPItemBalance")
+ private Double FGMPItemBalance;
+
+ @ApiModelProperty(value= "")
+ @TableField("FGMPBulkQty")
+ private Double FGMPBulkQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCustID")
+ private Integer FCustID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel1")
+ private Integer FMultiCheckLevel1;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel2")
+ private Integer FMultiCheckLevel2;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel3")
+ private Integer FMultiCheckLevel3;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel4")
+ private Integer FMultiCheckLevel4;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel5")
+ private Integer FMultiCheckLevel5;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMultiCheckLevel6")
+ private Integer FMultiCheckLevel6;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate1")
+ private Date FMultiCheckDate1;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate2")
+ private Date FMultiCheckDate2;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate3")
+ private Date FMultiCheckDate3;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate4")
+ private Date FMultiCheckDate4;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate5")
+ private Date FMultiCheckDate5;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FMultiCheckDate6")
+ private Date FMultiCheckDate6;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCurCheckLevel")
+ private Integer FCurCheckLevel;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMRPLockFlag")
+ private Integer FMRPLockFlag;
+
+ @ApiModelProperty(value= "")
+ @TableField("FHandworkClose")
+ private Integer FHandworkClose;
+
+ @ApiModelProperty(value= "")
+ @TableField("FConfirmerID")
+ private Integer FConfirmerID;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FConfirmDate")
+ private Date FConfirmDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FInHighLimit")
+ private Double FInHighLimit;
+
+ @ApiModelProperty(value= "")
+ @TableField("FInHighLimitQty")
+ private Double FInHighLimitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxInHighLimitQty")
+ private Double FAuxInHighLimitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FInLowLimit")
+ private Double FInLowLimit;
+
+ @ApiModelProperty(value= "")
+ @TableField("FInLowLimitQty")
+ private Double FInLowLimitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxInLowLimitQty")
+ private Double FAuxInLowLimitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FChangeTimes")
+ private Integer FChangeTimes;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCheckCommitQty")
+ private Double FCheckCommitQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxCheckCommitQty")
+ private Double FAuxCheckCommitQty;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FCloseDate")
+ private Date FCloseDate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPlanConfirmed")
+ private Integer FPlanConfirmed;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPlanMode")
+ private Integer FPlanMode;
+
+ @ApiModelProperty(value= "")
+ @TableField("FMTONo")
+ private String FMTONo;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPrintCount")
+ private Integer FPrintCount;
+
+ @ApiModelProperty(value= "")
+ @TableField("FFinClosed")
+ private Integer FFinClosed;
+
+ @ApiModelProperty(value= "")
+ @TableField("FFinCloseer")
+ private Integer FFinCloseer;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("FFinClosedate")
+ private Date FFinClosedate;
+
+ @ApiModelProperty(value= "")
+ @TableField("FStockFlag")
+ private Integer FStockFlag;
+
+ @ApiModelProperty(value= "")
+ @TableField("FStartFlag")
+ private Integer FStartFlag;
+
+ @ApiModelProperty(value= "")
+ @TableField("FVchBillNo")
+ private String FVchBillNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("FVchInterID")
+ private Integer FVchInterID;
+
+ @ApiModelProperty(value= "")
+ @TableField("FCardClosed")
+ private Integer FCardClosed;
+
+ @ApiModelProperty(value= "")
+ @TableField("FHRReadyTime")
+ private Double FHRReadyTime;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSourceTranType")
+ private Integer FSourceTranType;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSourceInterId")
+ private Integer FSourceInterId;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSourceBillNo")
+ private String FSourceBillNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("FDiscardStockInQty")
+ private Integer FDiscardStockInQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FSelDiscardStockInQty")
+ private Integer FSelDiscardStockInQty;
+
+ @ApiModelProperty(value= "")
+ @TableField("FPlanCategory")
+ private String FPlanCategory;
+
+ @ApiModelProperty(value= "")
+ @TableField("FAuxPropID")
+ private Integer FAuxPropID;
+
+ @ApiModelProperty(value= "")
+ @TableField("iz_sync_receive")
+ private String izSyncReceive;
+
+ @ApiModelProperty(value= "")
+ @TableField("iz_print")
+ private String izPrint;
+
+ @ApiModelProperty(value= "")
+ @TableField("iz_sync_receive_return")
+ private String izSyncReceiveReturn;
+
+ @ApiModelProperty(value= "")
+ @TableField("iz_print_return")
+ private String izPrintReturn;
+
+ public ICMO() {}
+
+ public ICMO(String FBrNo,Integer FInterID,String FBillNo,Short FTranType,Short FStatus,Short FMRP,Short FType,Integer FWorkShop,Integer FItemID,Double FQty,Double FCommitQty,Date FPlanCommitDate,Date FPlanFinishDate,Integer FConveyerID,Date FCommitDate,Integer FCheckerID,Date FCheckDate,Integer FRequesterID,Integer FBillerID,Integer FSourceEntryID,Short FClosed,String FNote,Integer FUnitID,Double FAuxCommitQty,Double FAuxQty,Integer FOrderInterID,Integer FPPOrderInterID,Integer FParentInterID,Boolean FCancellation,Integer FSupplyID,Double FQtyFinish,Double FQtyScrap,Double FQtyForItem,Double FQtyLost,Date FPlanIssueDate,String FRoutingID,Date FStartDate,Date FFinishDate,Double FAuxQtyFinish,Double FAuxQtyScrap,Double FAuxQtyForItem,Double FAuxQtyLost,Integer FMrpClosed,Integer FBomInterID,Double FQtyPass,Double FAuxQtyPass,Double FQtyBack,Double FAuxQtyBack,Double FFinishTime,Double FReadyTIme,Double FPowerCutTime,Double FFixTime,Double FWaitItemTime,Double FWaitToolTime,Integer FTaskID,Integer FWorkTypeID,Integer FCostObjID,Double FStockQty,Double FAuxStockQty,Boolean FSuspend,Integer FProjectNO,Integer FProductionLineID,Double FReleasedQty,Double FReleasedAuxQty,Double FUnScheduledQty,Double FUnScheduledAuxQty,Integer FSubEntryID,Integer FScheduleID,Integer FPlanOrderInterID,Double FProcessPrice,Double FProcessFee,String FGMPBatchNo,Double FGMPCollectRate,Double FGMPItemBalance,Double FGMPBulkQty,Integer FCustID,Integer FMultiCheckLevel1,Integer FMultiCheckLevel2,Integer FMultiCheckLevel3,Integer FMultiCheckLevel4,Integer FMultiCheckLevel5,Integer FMultiCheckLevel6,Date FMultiCheckDate1,Date FMultiCheckDate2,Date FMultiCheckDate3,Date FMultiCheckDate4,Date FMultiCheckDate5,Date FMultiCheckDate6,Integer FCurCheckLevel,Integer FMRPLockFlag,Integer FHandworkClose,Integer FConfirmerID,Date FConfirmDate,Double FInHighLimit,Double FInHighLimitQty,Double FAuxInHighLimitQty,Double FInLowLimit,Double FInLowLimitQty,Double FAuxInLowLimitQty,Integer FChangeTimes,Double FCheckCommitQty,Double FAuxCheckCommitQty,Date FCloseDate,Integer FPlanConfirmed,Integer FPlanMode,String FMTONo,Integer FPrintCount,Integer FFinClosed,Integer FFinCloseer,Date FFinClosedate,Integer FStockFlag,Integer FStartFlag,String FVchBillNo,Integer FVchInterID,Integer FCardClosed,Double FHRReadyTime,Integer FSourceTranType,Integer FSourceInterId,String FSourceBillNo,Integer FDiscardStockInQty,Integer FSelDiscardStockInQty,String FPlanCategory,Integer FAuxPropID,String izSyncReceive,String izPrint,String izSyncReceiveReturn,String izPrintReturn) {
+ this.FBrNo = FBrNo;
+ this.FInterID = FInterID;
+ this.FBillNo = FBillNo;
+ this.FTranType = FTranType;
+ this.FStatus = FStatus;
+ this.FMRP = FMRP;
+ this.FType = FType;
+ this.FWorkShop = FWorkShop;
+ this.FItemID = FItemID;
+ this.FQty = FQty;
+ this.FCommitQty = FCommitQty;
+ this.FPlanCommitDate = FPlanCommitDate;
+ this.FPlanFinishDate = FPlanFinishDate;
+ this.FConveyerID = FConveyerID;
+ this.FCommitDate = FCommitDate;
+ this.FCheckerID = FCheckerID;
+ this.FCheckDate = FCheckDate;
+ this.FRequesterID = FRequesterID;
+ this.FBillerID = FBillerID;
+ this.FSourceEntryID = FSourceEntryID;
+ this.FClosed = FClosed;
+ this.FNote = FNote;
+ this.FUnitID = FUnitID;
+ this.FAuxCommitQty = FAuxCommitQty;
+ this.FAuxQty = FAuxQty;
+ this.FOrderInterID = FOrderInterID;
+ this.FPPOrderInterID = FPPOrderInterID;
+ this.FParentInterID = FParentInterID;
+ this.FCancellation = FCancellation;
+ this.FSupplyID = FSupplyID;
+ this.FQtyFinish = FQtyFinish;
+ this.FQtyScrap = FQtyScrap;
+ this.FQtyForItem = FQtyForItem;
+ this.FQtyLost = FQtyLost;
+ this.FPlanIssueDate = FPlanIssueDate;
+ this.FRoutingID = FRoutingID;
+ this.FStartDate = FStartDate;
+ this.FFinishDate = FFinishDate;
+ this.FAuxQtyFinish = FAuxQtyFinish;
+ this.FAuxQtyScrap = FAuxQtyScrap;
+ this.FAuxQtyForItem = FAuxQtyForItem;
+ this.FAuxQtyLost = FAuxQtyLost;
+ this.FMrpClosed = FMrpClosed;
+ this.FBomInterID = FBomInterID;
+ this.FQtyPass = FQtyPass;
+ this.FAuxQtyPass = FAuxQtyPass;
+ this.FQtyBack = FQtyBack;
+ this.FAuxQtyBack = FAuxQtyBack;
+ this.FFinishTime = FFinishTime;
+ this.FReadyTIme = FReadyTIme;
+ this.FPowerCutTime = FPowerCutTime;
+ this.FFixTime = FFixTime;
+ this.FWaitItemTime = FWaitItemTime;
+ this.FWaitToolTime = FWaitToolTime;
+ this.FTaskID = FTaskID;
+ this.FWorkTypeID = FWorkTypeID;
+ this.FCostObjID = FCostObjID;
+ this.FStockQty = FStockQty;
+ this.FAuxStockQty = FAuxStockQty;
+ this.FSuspend = FSuspend;
+ this.FProjectNO = FProjectNO;
+ this.FProductionLineID = FProductionLineID;
+ this.FReleasedQty = FReleasedQty;
+ this.FReleasedAuxQty = FReleasedAuxQty;
+ this.FUnScheduledQty = FUnScheduledQty;
+ this.FUnScheduledAuxQty = FUnScheduledAuxQty;
+ this.FSubEntryID = FSubEntryID;
+ this.FScheduleID = FScheduleID;
+ this.FPlanOrderInterID = FPlanOrderInterID;
+ this.FProcessPrice = FProcessPrice;
+ this.FProcessFee = FProcessFee;
+ this.FGMPBatchNo = FGMPBatchNo;
+ this.FGMPCollectRate = FGMPCollectRate;
+ this.FGMPItemBalance = FGMPItemBalance;
+ this.FGMPBulkQty = FGMPBulkQty;
+ this.FCustID = FCustID;
+ this.FMultiCheckLevel1 = FMultiCheckLevel1;
+ this.FMultiCheckLevel2 = FMultiCheckLevel2;
+ this.FMultiCheckLevel3 = FMultiCheckLevel3;
+ this.FMultiCheckLevel4 = FMultiCheckLevel4;
+ this.FMultiCheckLevel5 = FMultiCheckLevel5;
+ this.FMultiCheckLevel6 = FMultiCheckLevel6;
+ this.FMultiCheckDate1 = FMultiCheckDate1;
+ this.FMultiCheckDate2 = FMultiCheckDate2;
+ this.FMultiCheckDate3 = FMultiCheckDate3;
+ this.FMultiCheckDate4 = FMultiCheckDate4;
+ this.FMultiCheckDate5 = FMultiCheckDate5;
+ this.FMultiCheckDate6 = FMultiCheckDate6;
+ this.FCurCheckLevel = FCurCheckLevel;
+ this.FMRPLockFlag = FMRPLockFlag;
+ this.FHandworkClose = FHandworkClose;
+ this.FConfirmerID = FConfirmerID;
+ this.FConfirmDate = FConfirmDate;
+ this.FInHighLimit = FInHighLimit;
+ this.FInHighLimitQty = FInHighLimitQty;
+ this.FAuxInHighLimitQty = FAuxInHighLimitQty;
+ this.FInLowLimit = FInLowLimit;
+ this.FInLowLimitQty = FInLowLimitQty;
+ this.FAuxInLowLimitQty = FAuxInLowLimitQty;
+ this.FChangeTimes = FChangeTimes;
+ this.FCheckCommitQty = FCheckCommitQty;
+ this.FAuxCheckCommitQty = FAuxCheckCommitQty;
+ this.FCloseDate = FCloseDate;
+ this.FPlanConfirmed = FPlanConfirmed;
+ this.FPlanMode = FPlanMode;
+ this.FMTONo = FMTONo;
+ this.FPrintCount = FPrintCount;
+ this.FFinClosed = FFinClosed;
+ this.FFinCloseer = FFinCloseer;
+ this.FFinClosedate = FFinClosedate;
+ this.FStockFlag = FStockFlag;
+ this.FStartFlag = FStartFlag;
+ this.FVchBillNo = FVchBillNo;
+ this.FVchInterID = FVchInterID;
+ this.FCardClosed = FCardClosed;
+ this.FHRReadyTime = FHRReadyTime;
+ this.FSourceTranType = FSourceTranType;
+ this.FSourceInterId = FSourceInterId;
+ this.FSourceBillNo = FSourceBillNo;
+ this.FDiscardStockInQty = FDiscardStockInQty;
+ this.FSelDiscardStockInQty = FSelDiscardStockInQty;
+ this.FPlanCategory = FPlanCategory;
+ this.FAuxPropID = FAuxPropID;
+ this.izSyncReceive = izSyncReceive;
+ this.izPrint = izPrint;
+ this.izSyncReceiveReturn = izSyncReceiveReturn;
+ this.izPrintReturn = izPrintReturn;
+ }
+
+// ICMO iCMO = new ICMO(
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null //
+// );
+
+ public String getFPlanCommitDate$(){
+ if (Cools.isEmpty(this.FPlanCommitDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.FPlanCommitDate);
+ }
+
+ public String getFPlanFinishDate$(){
+ if (Cools.isEmpty(this.FPlanFinishDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.FPlanFinishDate);
+ }
+
+ public String getFCommitDate$(){
+ if (Cools.isEmpty(this.FCommitDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FCommitDate);
+ }
+
+ public String getFCheckDate$(){
+ if (Cools.isEmpty(this.FCheckDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FCheckDate);
+ }
+
+ public String getFPlanIssueDate$(){
+ if (Cools.isEmpty(this.FPlanIssueDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FPlanIssueDate);
+ }
+
+ public String getFStartDate$(){
+ if (Cools.isEmpty(this.FStartDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FStartDate);
+ }
+
+ public String getFFinishDate$(){
+ if (Cools.isEmpty(this.FFinishDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FFinishDate);
+ }
+
+ public String getFMultiCheckDate1$(){
+ if (Cools.isEmpty(this.FMultiCheckDate1)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate1);
+ }
+
+ public String getFMultiCheckDate2$(){
+ if (Cools.isEmpty(this.FMultiCheckDate2)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate2);
+ }
+
+ public String getFMultiCheckDate3$(){
+ if (Cools.isEmpty(this.FMultiCheckDate3)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate3);
+ }
+
+ public String getFMultiCheckDate4$(){
+ if (Cools.isEmpty(this.FMultiCheckDate4)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate4);
+ }
+
+ public String getFMultiCheckDate5$(){
+ if (Cools.isEmpty(this.FMultiCheckDate5)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate5);
+ }
+
+ public String getFMultiCheckDate6$(){
+ if (Cools.isEmpty(this.FMultiCheckDate6)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FMultiCheckDate6);
+ }
+
+ public String getFConfirmDate$(){
+ if (Cools.isEmpty(this.FConfirmDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FConfirmDate);
+ }
+
+ public String getFCloseDate$(){
+ if (Cools.isEmpty(this.FCloseDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FCloseDate);
+ }
+
+ public String getFFinClosedate$(){
+ if (Cools.isEmpty(this.FFinClosedate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.FFinClosedate);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/ICMOMapper.java b/src/main/java/com/zy/asrs/mapper/ICMOMapper.java
new file mode 100644
index 0000000..b598f1f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/ICMOMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.ICMO;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ICMOMapper extends BaseMapper<ICMO> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/ICMOService.java b/src/main/java/com/zy/asrs/service/ICMOService.java
new file mode 100644
index 0000000..196808e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/ICMOService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.zy.asrs.entity.ICMO;
+import com.baomidou.mybatisplus.service.IService;
+
+
+public interface ICMOService extends IService<ICMO> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java
new file mode 100644
index 0000000..6370616
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/ICMOServiceImpl.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.zy.asrs.mapper.ICMOMapper;
+import com.zy.asrs.entity.ICMO;
+import com.zy.asrs.service.ICMOService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("iCMOService")
+@DS("slave_1")
+public class ICMOServiceImpl extends ServiceImpl<ICMOMapper, ICMO> implements ICMOService {
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index d69ef4f..20c6f4d 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -109,96 +109,96 @@
//
// }
- @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
- private void ShuttleOutTaskSend(){
- List<WrkMast> wrkMastsMove = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
- if (!wrkMastsMove.isEmpty()) {
- return;
- }
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 1,10,53,54,57).eq("crn_no",7));
- if (!Cools.isEmpty(wrkMasts1)){
- return;
- }
- List<WrkMast> wrkMasts = wrkMastService.selectToShuttleOutTask();
- if (wrkMasts.isEmpty()) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- if (locMast == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
- ShuttleOutTask param = new ShuttleOutTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setOriginLoc(loc);
- param.setOriginSite("31004");
- param.setDestSite("31002");
- param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createOutTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }catch (Exception e){
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
-
- @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
- private void ShuttleMoveTaskSend(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
- if (wrkMasts.isEmpty()) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
- if (originLoc == null || destLoc == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String originLoc1 = (originLoc.getRow1()-16)+"-"+originLoc.getBay1()+"-"+originLoc.getLev1();
- String destLoc1 = (destLoc.getRow1()-16)+"-"+destLoc.getBay1()+"-"+destLoc.getLev1();
- ShuttleMoveTask param = new ShuttleMoveTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setOriginLoc(originLoc1);
- param.setDestLoc(destLoc1);
- param.setRecord(true);
- param.setPriority("21");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createLadenMoveTakeTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }catch (Exception e){
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
+// @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
+// private void ShuttleOutTaskSend(){
+// List<WrkMast> wrkMastsMove = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
+// if (!wrkMastsMove.isEmpty()) {
+// return;
+// }
+// List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("io_type", 1,10,53,54,57).eq("crn_no",7));
+// if (!Cools.isEmpty(wrkMasts1)){
+// return;
+// }
+// List<WrkMast> wrkMasts = wrkMastService.selectToShuttleOutTask();
+// if (wrkMasts.isEmpty()) {
+// return;
+// }
+// try {
+// for (WrkMast wrkMast : wrkMasts) {
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+// if (locMast == null) {
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+// String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
+// ShuttleOutTask param = new ShuttleOutTask();
+// param.setTaskNo(wrkMast.getWrkNo().toString());
+// param.setOriginLoc(loc);
+// param.setOriginSite("31004");
+// param.setDestSite("31002");
+// param.setPriority("11");
+// String response = new HttpHandler.Builder()
+// .setUri(shuttleWcsUrl)
+// .setPath("/openapi/createOutTask")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// wrkMast.setWrkSts(105L);
+// if (!wrkMastService.updateById(wrkMast)) {
+// log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+// }
+// }
+// }
+// }catch (Exception e){
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+//
+// }
+//
+// @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
+// private void ShuttleMoveTaskSend(){
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
+// if (wrkMasts.isEmpty()) {
+// return;
+// }
+// try {
+// for (WrkMast wrkMast : wrkMasts) {
+// LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+// LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+// if (originLoc == null || destLoc == null) {
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+// String originLoc1 = (originLoc.getRow1()-16)+"-"+originLoc.getBay1()+"-"+originLoc.getLev1();
+// String destLoc1 = (destLoc.getRow1()-16)+"-"+destLoc.getBay1()+"-"+destLoc.getLev1();
+// ShuttleMoveTask param = new ShuttleMoveTask();
+// param.setTaskNo(wrkMast.getWrkNo().toString());
+// param.setOriginLoc(originLoc1);
+// param.setDestLoc(destLoc1);
+// param.setRecord(true);
+// param.setPriority("21");
+// String response = new HttpHandler.Builder()
+// .setUri(shuttleWcsUrl)
+// .setPath("/openapi/createLadenMoveTakeTask")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// wrkMast.setWrkSts(105L);
+// if (!wrkMastService.updateById(wrkMast)) {
+// log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+// }
+// }
+// }
+// }catch (Exception e){
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+//
+// }
diff --git a/src/main/java/com/zy/asrs/utils/ERPDateUtils.java b/src/main/java/com/zy/asrs/utils/ERPDateUtils.java
new file mode 100644
index 0000000..00163fe
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/ERPDateUtils.java
@@ -0,0 +1,24 @@
+package com.zy.asrs.utils;
+
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+
+public class ERPDateUtils {
+
+ public static String getERPFiltterDate(String data){
+ Instant instant = Instant.parse(data);
+ LocalDateTime dateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+ LocalDate date = dateTime.toLocalDate();
+
+ LocalDateTime startOfDay = date.atStartOfDay();
+ LocalDateTime endOfDay = date.atTime(LocalTime.MAX);
+
+ // 5. 鏍煎紡鍖栬緭鍑�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String startStr = startOfDay.format(formatter);
+ String endStr = endOfDay.format(formatter).split("\\.")[0]; // 鍘婚櫎绾崇閮ㄥ垎
+
+ return startStr + " - " + endStr;
+
+ }
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 4e9f380..6a04eef 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,11 +17,14 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="127.0.0.1:1433;databasename=xtyIS";
+ generator.url="127.0.0.1:1433;databasename=AIS20201127144525";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_erp_receiving";
+ generator.table="man_ICMO";
generator.packagePath="com.zy.asrs";
+ generator.html=false;
+ generator.htmlDetail=false;
+ generator.js=false;
generator.build();
}
diff --git a/src/main/java/iCMO.sql b/src/main/java/iCMO.sql
new file mode 100644
index 0000000..7000bf5
--- /dev/null
+++ b/src/main/java/iCMO.sql
@@ -0,0 +1,18 @@
+-- save iCMO record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO/iCMO.html', 'iCMO绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'iCMO#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO/iCMO.html', N'iCMO绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'iCMO#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 93ac966..023a0f3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,10 +9,19 @@
jmx:
enabled: false
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyIS
- username: sa
- password: sa@123
+ dynamic:
+ primary: master
+ datasource:
+ master:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyIS
+ username: sa
+ password: sa@123
+ slave_1:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=AIS20201127144525
+ username: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/ICMOMapper.xml b/src/main/resources/mapper/ICMOMapper.xml
new file mode 100644
index 0000000..1806748
--- /dev/null
+++ b/src/main/resources/mapper/ICMOMapper.xml
@@ -0,0 +1,139 @@
+<?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.ICMOMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ICMO">
+ <result column="FBrNo" property="FBrNo" />
+ <result column="FInterID" property="FInterID" />
+ <result column="FBillNo" property="FBillNo" />
+ <result column="FTranType" property="FTranType" />
+ <result column="FStatus" property="FStatus" />
+ <result column="FMRP" property="FMRP" />
+ <result column="FType" property="FType" />
+ <result column="FWorkShop" property="FWorkShop" />
+ <result column="FItemID" property="FItemID" />
+ <result column="FQty" property="FQty" />
+ <result column="FCommitQty" property="FCommitQty" />
+ <result column="FPlanCommitDate" property="FPlanCommitDate" />
+ <result column="FPlanFinishDate" property="FPlanFinishDate" />
+ <result column="FConveyerID" property="FConveyerID" />
+ <result column="FCommitDate" property="FCommitDate" />
+ <result column="FCheckerID" property="FCheckerID" />
+ <result column="FCheckDate" property="FCheckDate" />
+ <result column="FRequesterID" property="FRequesterID" />
+ <result column="FBillerID" property="FBillerID" />
+ <result column="FSourceEntryID" property="FSourceEntryID" />
+ <result column="FClosed" property="FClosed" />
+ <result column="FNote" property="FNote" />
+ <result column="FUnitID" property="FUnitID" />
+ <result column="FAuxCommitQty" property="FAuxCommitQty" />
+ <result column="FAuxQty" property="FAuxQty" />
+ <result column="FOrderInterID" property="FOrderInterID" />
+ <result column="FPPOrderInterID" property="FPPOrderInterID" />
+ <result column="FParentInterID" property="FParentInterID" />
+ <result column="FCancellation" property="FCancellation" />
+ <result column="FSupplyID" property="FSupplyID" />
+ <result column="FQtyFinish" property="FQtyFinish" />
+ <result column="FQtyScrap" property="FQtyScrap" />
+ <result column="FQtyForItem" property="FQtyForItem" />
+ <result column="FQtyLost" property="FQtyLost" />
+ <result column="FPlanIssueDate" property="FPlanIssueDate" />
+ <result column="FRoutingID" property="FRoutingID" />
+ <result column="FStartDate" property="FStartDate" />
+ <result column="FFinishDate" property="FFinishDate" />
+ <result column="FAuxQtyFinish" property="FAuxQtyFinish" />
+ <result column="FAuxQtyScrap" property="FAuxQtyScrap" />
+ <result column="FAuxQtyForItem" property="FAuxQtyForItem" />
+ <result column="FAuxQtyLost" property="FAuxQtyLost" />
+ <result column="FMrpClosed" property="FMrpClosed" />
+ <result column="FBomInterID" property="FBomInterID" />
+ <result column="FQtyPass" property="FQtyPass" />
+ <result column="FAuxQtyPass" property="FAuxQtyPass" />
+ <result column="FQtyBack" property="FQtyBack" />
+ <result column="FAuxQtyBack" property="FAuxQtyBack" />
+ <result column="FFinishTime" property="FFinishTime" />
+ <result column="FReadyTIme" property="FReadyTIme" />
+ <result column="FPowerCutTime" property="FPowerCutTime" />
+ <result column="FFixTime" property="FFixTime" />
+ <result column="FWaitItemTime" property="FWaitItemTime" />
+ <result column="FWaitToolTime" property="FWaitToolTime" />
+ <result column="FTaskID" property="FTaskID" />
+ <result column="FWorkTypeID" property="FWorkTypeID" />
+ <result column="FCostObjID" property="FCostObjID" />
+ <result column="FStockQty" property="FStockQty" />
+ <result column="FAuxStockQty" property="FAuxStockQty" />
+ <result column="FSuspend" property="FSuspend" />
+ <result column="FProjectNO" property="FProjectNO" />
+ <result column="FProductionLineID" property="FProductionLineID" />
+ <result column="FReleasedQty" property="FReleasedQty" />
+ <result column="FReleasedAuxQty" property="FReleasedAuxQty" />
+ <result column="FUnScheduledQty" property="FUnScheduledQty" />
+ <result column="FUnScheduledAuxQty" property="FUnScheduledAuxQty" />
+ <result column="FSubEntryID" property="FSubEntryID" />
+ <result column="FScheduleID" property="FScheduleID" />
+ <result column="FPlanOrderInterID" property="FPlanOrderInterID" />
+ <result column="FProcessPrice" property="FProcessPrice" />
+ <result column="FProcessFee" property="FProcessFee" />
+ <result column="FGMPBatchNo" property="FGMPBatchNo" />
+ <result column="FGMPCollectRate" property="FGMPCollectRate" />
+ <result column="FGMPItemBalance" property="FGMPItemBalance" />
+ <result column="FGMPBulkQty" property="FGMPBulkQty" />
+ <result column="FCustID" property="FCustID" />
+ <result column="FMultiCheckLevel1" property="FMultiCheckLevel1" />
+ <result column="FMultiCheckLevel2" property="FMultiCheckLevel2" />
+ <result column="FMultiCheckLevel3" property="FMultiCheckLevel3" />
+ <result column="FMultiCheckLevel4" property="FMultiCheckLevel4" />
+ <result column="FMultiCheckLevel5" property="FMultiCheckLevel5" />
+ <result column="FMultiCheckLevel6" property="FMultiCheckLevel6" />
+ <result column="FMultiCheckDate1" property="FMultiCheckDate1" />
+ <result column="FMultiCheckDate2" property="FMultiCheckDate2" />
+ <result column="FMultiCheckDate3" property="FMultiCheckDate3" />
+ <result column="FMultiCheckDate4" property="FMultiCheckDate4" />
+ <result column="FMultiCheckDate5" property="FMultiCheckDate5" />
+ <result column="FMultiCheckDate6" property="FMultiCheckDate6" />
+ <result column="FCurCheckLevel" property="FCurCheckLevel" />
+ <result column="FMRPLockFlag" property="FMRPLockFlag" />
+ <result column="FHandworkClose" property="FHandworkClose" />
+ <result column="FConfirmerID" property="FConfirmerID" />
+ <result column="FConfirmDate" property="FConfirmDate" />
+ <result column="FInHighLimit" property="FInHighLimit" />
+ <result column="FInHighLimitQty" property="FInHighLimitQty" />
+ <result column="FAuxInHighLimitQty" property="FAuxInHighLimitQty" />
+ <result column="FInLowLimit" property="FInLowLimit" />
+ <result column="FInLowLimitQty" property="FInLowLimitQty" />
+ <result column="FAuxInLowLimitQty" property="FAuxInLowLimitQty" />
+ <result column="FChangeTimes" property="FChangeTimes" />
+ <result column="FCheckCommitQty" property="FCheckCommitQty" />
+ <result column="FAuxCheckCommitQty" property="FAuxCheckCommitQty" />
+ <result column="FCloseDate" property="FCloseDate" />
+ <result column="FPlanConfirmed" property="FPlanConfirmed" />
+ <result column="FPlanMode" property="FPlanMode" />
+ <result column="FMTONo" property="FMTONo" />
+ <result column="FPrintCount" property="FPrintCount" />
+ <result column="FFinClosed" property="FFinClosed" />
+ <result column="FFinCloseer" property="FFinCloseer" />
+ <result column="FFinClosedate" property="FFinClosedate" />
+ <result column="FStockFlag" property="FStockFlag" />
+ <result column="FStartFlag" property="FStartFlag" />
+ <result column="FVchBillNo" property="FVchBillNo" />
+ <result column="FVchInterID" property="FVchInterID" />
+ <result column="FCardClosed" property="FCardClosed" />
+ <result column="FHRReadyTime" property="FHRReadyTime" />
+ <result column="FSourceTranType" property="FSourceTranType" />
+ <result column="FSourceInterId" property="FSourceInterId" />
+ <result column="FSourceBillNo" property="FSourceBillNo" />
+ <result column="FDiscardStockInQty" property="FDiscardStockInQty" />
+ <result column="FSelDiscardStockInQty" property="FSelDiscardStockInQty" />
+ <result column="FPlanCategory" property="FPlanCategory" />
+ <result column="FAuxPropID" property="FAuxPropID" />
+ <result column="Tflag" property="Tflag" />
+ <result column="T_flag" property="TFlag" />
+ <result column="iz_sync_receive" property="izSyncReceive" />
+ <result column="iz_print" property="izPrint" />
+ <result column="iz_sync_receive_return" property="izSyncReceiveReturn" />
+ <result column="iz_print_return" property="izPrintReturn" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index 687495e..6ab4d8c 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -16,7 +16,7 @@
<el-form :inline="true">
<el-form-item label="寮�宸ユ棩鏈�">
<el-date-picker
- v-model="tableSearchParam.time"
+ v-model="tableSearchParam.FPlanCommitDate"
type="date"
placeholder="閫夋嫨鏃ユ湡"
:default-value="defaultTime"
@@ -54,27 +54,27 @@
</el-table-column>
<el-table-column type="index" width="50" >
</el-table-column>
- <el-table-column prop="Head.FSourceBillNo" label="鐢熶骇鍗曞彿" >
+ <el-table-column prop="fsourceBillNo" label="鐢熶骇鍗曞彿" >
</el-table-column>
- <el-table-column prop="Head.FBillNo" label="浠诲姟鍗曞彿">
+ <el-table-column prop="fbillNo" label="浠诲姟鍗曞彿">
</el-table-column>
- <el-table-column prop="Head.FItemID" label="鐗╂枡缂栫爜">
+ <el-table-column prop="fitemID" label="鐗╂枡缂栫爜">
</el-table-column>
- <el-table-column prop="Head.FItemID" label="鐗╂枡鍚嶇О">
+ <el-table-column prop="fitemID" label="鐗╂枡鍚嶇О">
</el-table-column>
- <el-table-column prop="Head.FSourceBillNo" label="瑙勬牸">
+ <el-table-column prop="fsourceBillNo" label="瑙勬牸">
</el-table-column>
- <el-table-column prop="Head.FWorkShop" label="杞﹂棿">
+ <el-table-column prop="fworkShop" label="杞﹂棿">
</el-table-column>
- <el-table-column prop="Head.Fauxqty" label="鏁伴噺">
+ <el-table-column prop="fauxQty" label="鏁伴噺">
</el-table-column>
- <el-table-column prop="Head.FPlanCommitDate" label="璁″垝寮�宸ユ椂闂�">
+ <el-table-column prop="fplanCommitDate$" label="璁″垝寮�宸ユ椂闂�">
</el-table-column>
- <el-table-column prop="Head.FPlanFinishDate" label="璁″垝瀹屽伐鏃堕棿">
+ <el-table-column prop="fplanFinishDate$" label="璁″垝瀹屽伐鏃堕棿">
</el-table-column>
- <el-table-column prop="Head.FSourceBillNo" label="鏄惁鍚屾">
+ <el-table-column prop="fsourceBillNo" label="鏄惁鍚屾">
</el-table-column>
- <el-table-column prop="Head.FSourceBillNo" label="鏄惁閫�鏂�">
+ <el-table-column prop="fsourceBillNo" label="鏄惁閫�鏂�">
</el-table-column>
</el-table>
<div style="margin-top: 10px">
@@ -108,7 +108,7 @@
const pageTotal = ref(0)
const tableSearchParam = ref({
produce_no: null,
- time: new Date()
+ FPlanCommitDate: new Date()
})
const tableData = ref([])
const defaultTime = ref(new Date())
@@ -122,7 +122,7 @@
data.create_time = tableSearchParam.value.datetime[0] + " - " + tableSearchParam.value.datetime[1]
}
$.ajax({
- url: baseUrl + "/kingdee/get/manufacturingorder/list",
+ url: baseUrl + "/iCMO/list/auth",
headers: {
'token': localStorage.getItem('token')
},
@@ -132,8 +132,8 @@
method: 'GET',
success: function(res) {
if (res.code == 200) {
- tableData.value = res.data.List
- pageTotal.value = res.data.TotalItems
+ tableData.value = res.data.records
+ pageTotal.value = res.data.total
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
--
Gitblit v1.9.1