From 0bcffff8196eaa3da0f63c3c171102e7434babba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 05 九月 2025 15:29:25 +0800
Subject: [PATCH] #erp.物料信息
---
src/main/java/com/zy/asrs/entity/ICMO.java | 272 +----------------------------
src/main/java/com/zy/asrs/mapper/ICItemCoreMapper.java | 12 +
src/main/java/com/zy/asrs/entity/ICItemCore.java | 43 ++++
src/main/java/com/zy/asrs/service/impl/ICItemCoreServiceImpl.java | 16 +
src/main/java/com/zy/asrs/controller/ICItemCoreController.java | 124 +++++++++++++
src/main/resources/mapper/ICItemCoreMapper.xml | 12 +
src/main/webapp/views/erpReceiving/erpReceiving.html | 6
src/main/java/com/zy/common/CodeBuilder.java | 3
src/main/java/com/zy/asrs/service/ICItemCoreService.java | 9 +
9 files changed, 233 insertions(+), 264 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ICItemCoreController.java b/src/main/java/com/zy/asrs/controller/ICItemCoreController.java
new file mode 100644
index 0000000..38c0a52
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/ICItemCoreController.java
@@ -0,0 +1,124 @@
+package com.zy.asrs.controller;
+
+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.ICItemCore;
+import com.zy.asrs.service.ICItemCoreService;
+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 ICItemCoreController extends BaseController {
+
+ @Autowired
+ private ICItemCoreService ICItemCoreService;
+
+ @RequestMapping(value = "/ICItemCore/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(ICItemCoreService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/ICItemCore/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<ICItemCore> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(ICItemCore.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(ICItemCoreService.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 = "/ICItemCore/add/auth")
+ @ManagerAuth
+ public R add(ICItemCore ICItemCore) {
+ ICItemCoreService.insert(ICItemCore);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/ICItemCore/update/auth")
+ @ManagerAuth
+ public R update(ICItemCore ICItemCore){
+ if (Cools.isEmpty(ICItemCore) || null==ICItemCore.getFItemID()){
+ return R.error();
+ }
+ ICItemCoreService.updateById(ICItemCore);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/ICItemCore/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ ICItemCoreService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/ICItemCore/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<ICItemCore> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("ICItemCore"));
+ convert(map, wrapper);
+ List<ICItemCore> list = ICItemCoreService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/ICItemCoreQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<ICItemCore> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<ICItemCore> page = ICItemCoreService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ICItemCore ICItemCore : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", ICItemCore.getFItemID());
+ map.put("value", ICItemCore.getFItemID());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/ICItemCore/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<ICItemCore> wrapper = new EntityWrapper<ICItemCore>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != ICItemCoreService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(ICItemCore.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/ICItemCore.java b/src/main/java/com/zy/asrs/entity/ICItemCore.java
new file mode 100644
index 0000000..a5382c1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/ICItemCore.java
@@ -0,0 +1,43 @@
+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 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("t_ICItemCore")
+public class ICItemCore implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "FItemID", type = IdType.INPUT)
+ private Integer FItemID;
+
+ @TableField("FModel")
+ private String FModel;
+
+ @TableField("FName")
+ private String FName;
+
+ @TableField("FNumber")
+ private String FNumber;
+
+
+
+ public ICItemCore() {}
+
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/ICMO.java b/src/main/java/com/zy/asrs/entity/ICMO.java
index a9e0f9d..0770b72 100644
--- a/src/main/java/com/zy/asrs/entity/ICMO.java
+++ b/src/main/java/com/zy/asrs/entity/ICMO.java
@@ -1,9 +1,14 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
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 com.core.common.SpringUtils;
+
+import com.zy.asrs.service.ICItemCoreService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -575,267 +580,14 @@
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;
- }
+ public ICItemCore getICItemCore(){
+ if (Cools.isEmpty(this.FItemID)){
+ return null;
+ }
+ ICItemCoreService icItemCoreService = SpringUtils.getBean(ICItemCoreService.class);
+ return icItemCoreService.selectOne(new EntityWrapper<ICItemCore>().eq("FItemID", this.FItemID));
-// 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)){
diff --git a/src/main/java/com/zy/asrs/mapper/ICItemCoreMapper.java b/src/main/java/com/zy/asrs/mapper/ICItemCoreMapper.java
new file mode 100644
index 0000000..40abea7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/ICItemCoreMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.ICItemCore;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ICItemCoreMapper extends BaseMapper<ICItemCore> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/ICItemCoreService.java b/src/main/java/com/zy/asrs/service/ICItemCoreService.java
new file mode 100644
index 0000000..0876e1f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/ICItemCoreService.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.service;
+
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.ICItemCore;
+
+public interface ICItemCoreService extends IService<ICItemCore> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/ICItemCoreServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ICItemCoreServiceImpl.java
new file mode 100644
index 0000000..79629aa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/ICItemCoreServiceImpl.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.service.impl;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.zy.asrs.entity.ICItemCore;
+import com.zy.asrs.mapper.ICItemCoreMapper;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.service.ICItemCoreService;
+import org.springframework.stereotype.Service;
+
+@Service("ICItemCoreService")
+@DS("slave_1")
+public class ICItemCoreServiceImpl extends ServiceImpl<ICItemCoreMapper, ICItemCore> implements ICItemCoreService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 6a04eef..3b3a685 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,11 +20,12 @@
generator.url="127.0.0.1:1433;databasename=AIS20201127144525";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_ICMO";
+ generator.table="t_ICItemBase";
generator.packagePath="com.zy.asrs";
generator.html=false;
generator.htmlDetail=false;
generator.js=false;
+ generator.sql=false;
generator.build();
}
diff --git a/src/main/resources/mapper/ICItemCoreMapper.xml b/src/main/resources/mapper/ICItemCoreMapper.xml
new file mode 100644
index 0000000..466c9a8
--- /dev/null
+++ b/src/main/resources/mapper/ICItemCoreMapper.xml
@@ -0,0 +1,12 @@
+<?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.ICItemCoreMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ICItemCore">
+ <result column="FItemID" property="FItemID" />
+
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/views/erpReceiving/erpReceiving.html b/src/main/webapp/views/erpReceiving/erpReceiving.html
index fbdb483..22ac6c7 100644
--- a/src/main/webapp/views/erpReceiving/erpReceiving.html
+++ b/src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -58,11 +58,11 @@
</el-table-column>
<el-table-column prop="fbillNo" label="浠诲姟鍗曞彿">
</el-table-column>
- <el-table-column prop="fitemID" label="鐗╂枡缂栫爜">
+ <el-table-column prop="icitemCore.fnumber" label="鐗╂枡缂栫爜">
</el-table-column>
- <el-table-column prop="fitemID" label="鐗╂枡鍚嶇О">
+ <el-table-column prop="icitemCore.fname" label="鐗╂枡鍚嶇О">
</el-table-column>
- <el-table-column prop="fsourceBillNo" label="瑙勬牸">
+ <el-table-column prop="icitemCore.fmodel" label="瑙勬牸">
</el-table-column>
<el-table-column prop="fworkShop" label="杞﹂棿">
</el-table-column>
--
Gitblit v1.9.1