Merge remote-tracking branch 'origin/master'

op-common/op-common-core/src/main/java/com/op/common/core/domain/ExcelCol.java

@@ -0,0 +1,49 @@
+package com.op.common.core.domain;
+
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 附件对象 base_file
+ *
+ * @author Open Platform
+ * @date 2023-07-10
+ */
+public class ExcelCol extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+	private String title;//表头名称
+	private String field;//内容名称(与数据库传回的参数字段对应)
+	private int width;//单元格宽度
+
+	public ExcelCol(String title, String field, int width) {
+		this.title = title;
+		this.field = field;
+		this.width = width;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+}

op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java

@@ -0,0 +1,118 @@
+package com.op.common.core.utils.poi;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.op.common.core.domain.ExcelCol;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Excel相关处理
+ *
+ * @author OP
+ */
+public class ExcelMapUtil {
+	//下载
+	public static <T> SXSSFWorkbook initWorkbook(String sheetName , String title , List<ExcelCol> excelCol , List<T> data){
+		SXSSFWorkbook workbook = new SXSSFWorkbook();
+		int colSize = excelCol.size();
+
+		//创建Sheet（工作簿）
+		Sheet sheet = null;
+		if (!StringUtils.hasText(sheetName)){
+			sheet = workbook.createSheet();
+		}else{
+			sheet = workbook.createSheet(sheetName);
+		}
+//		//创建主标题行(第一行)
+//		Row sheetTitleRow = sheet.createRow(0);
+//		Cell titleCell = sheetTitleRow.createCell(0);//创建第一行第一个单元格
+//		titleCell.setCellValue(title);//传值
+//		titleCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
+//		//主标题行合并单元格
+//		CellRangeAddress cellAddresses = new CellRangeAddress(0, 0, 0, colSize - 1);
+//		sheet.addMergedRegion(cellAddresses);
+		//创建表头行（第二行）
+		Row sheetHeadRow = sheet.createRow(0);//1
+		//遍历表头名称，创建表头单元格
+		for(int i = 0 ; i < colSize ; i++){
+			sheet.setColumnWidth(i,(excelCol.get(i).getWidth())*256);//宽度单位是字符的256分之一
+			Cell headCell = sheetHeadRow.createCell(i);
+			headCell.setCellValue(excelCol.get(i).getTitle());//传值
+			headCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
+		}
+
+		//将data中的值填充到excel
+		int rowNum = sheet.getLastRowNum()+1;
+		Iterator<T> iterator = data.iterator();
+		//遍历数据
+		for (;iterator.hasNext();){
+			Row dataRow = sheet.createRow(rowNum);//创建行
+			T obj = iterator.next();//获取当前行对应的数据
+			JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
+			for (int i = 0 ; i < colSize ; i++ ){
+				Cell dataCell = dataRow.createCell(i);
+				dataCell.setCellStyle(getDataFont(workbook));
+				if(i>=2){
+					dataCell.setCellValue(getValueNum(jsonObject.get(excelCol.get(i).getField())));
+				}else{
+					dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField())));
+				}
+
+			}
+			iterator.remove();
+			rowNum++;
+		}
+		return workbook;
+	}
+
+	//标题样式
+	public static CellStyle getHeaderFont(Workbook workbook){
+		Font font = workbook.createFont();
+		font.setFontHeightInPoints((short) 16);//字体大小
+		font.setBold(true);//加粗
+		CellStyle cellStyle = workbook.createCellStyle();
+		cellStyle.setFont(font);
+		cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中
+		cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中
+		return cellStyle;
+	}
+
+	//内容样式
+	public static CellStyle getDataFont(Workbook workbook){
+		Font font = workbook.createFont();
+		font.setFontHeightInPoints((short) 12);//字体大小
+		font.setBold(false);//不加粗
+		CellStyle cellStyle = workbook.createCellStyle();
+		cellStyle.setFont(font);
+		cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中
+		cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中
+		return cellStyle;
+	}
+
+	//处理数据
+	public static String getValue(Object object){
+		if (object==null){
+			return "";
+		}else {
+			return object.toString();
+		}
+	}
+	//处理数据
+	public static Integer getValueNum(Object object){
+		if (object==null){
+			return 0;
+		}else {
+			return Integer.parseInt(object.toString());
+		}
+	}
+}

op-modules/op-device/push-device.bat

@@ -0,0 +1,40 @@
+@echo off
+echo --------------------------------自定义参数，启动前先修改--------------------------------------
+set jarName=op-modules-device.jar
+set profile=dev
+set imageURI=192.168.202.36:30002/op-lanju/op-device
+rem echo 获取当前日期字符串
+for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
+rem echo 获取当前时间字符串
+for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
+rem echo 如当前小时小于10，将空格替换为0
+set T=%T: =0%
+rem echo 显示输出日期时间字符串
+set imageVersion=%D%%T%
+::输出发版信息
+echo jar包名称:%jarName%
+echo 启动环境:%profile%
+echo 镜像库地址:%imageURI%
+echo 镜像版本:%imageVersion%
+
+echo --------------------------------mvn package...--------------------------------
+::call mvn clean package -Dmaven.test.skip=true
+
+cd .\target
+SET df=Dockerfile
+if exist %df% (
+	del /f /s /q .\Dockerfile
+)
+echo --------------------------------创建Dockerfile--------------------------------
+echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
+echo COPY %jarName% /application.jar >> Dockerfile
+echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
+echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile
+dir
+echo --------------------------------docker login...-------------------------------
+docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
+echo --------------------------------docker build...-------------------------------
+docker build -t %imageURI%:%imageVersion% .
+echo --------------------------------docker push...--------------------------------
+docker push %imageURI%:%imageVersion%
+@pause

op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java

@@ -0,0 +1,97 @@
+package com.op.device.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.RequiresPermissions;
+import com.op.device.domain.SparePartsInStorage;
+import com.op.device.service.ISparePartsInOutStorageService;
+import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.core.utils.poi.ExcelUtil;
+import com.op.common.core.web.page.TableDataInfo;
+
+/**
+ * 备品备件出入库Controller
+ * 
+ * @author Open Platform
+ * @date 2023-10-17
+ */
+@RestController
+@RequestMapping("/sparepartsInOutStorage")
+public class SparePartsInOutStorageController extends BaseController {
+	@Autowired
+	private ISparePartsInOutStorageService sparePartsInOutStorageService;
+
+	/**
+	 * 查询备品备件出入库列表
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:list")
+	@GetMapping("/list")
+	public TableDataInfo list(SparePartsInStorage sparePartsInStorage) {
+		startPage();
+		List<SparePartsInStorage> list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 导出备品备件出入库列表
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:export")
+	@Log(title = "备品备件出入库", businessType = BusinessType.EXPORT)
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SparePartsInStorage sparePartsInStorage) {
+		List<SparePartsInStorage> list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage);
+		ExcelUtil<SparePartsInStorage> util = new ExcelUtil<SparePartsInStorage>(SparePartsInStorage.class);
+		util.exportExcel(response, list, "备品备件出入库数据");
+	}
+
+	/**
+	 * 获取备品备件出入库详细信息
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:query")
+	@GetMapping(value = "/{rawOrderInSnId}")
+	public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) {
+		return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId));
+	}
+
+	/**
+	 * 新增备品备件出入库
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:add")
+	@Log(title = "备品备件出入库", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) {
+		return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage));
+	}
+
+	/**
+	 * 修改备品备件出入库
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:edit")
+	@Log(title = "备品备件出入库", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) {
+		return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage));
+	}
+
+	/**
+	 * 删除备品备件出入库
+	 */
+	@RequiresPermissions("device:sparepartsInOutStorage:remove")
+	@Log(title = "备品备件出入库", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rawOrderInSnIds}")
+	public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) {
+		return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds));
+	}
+}

op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java

@@ -0,0 +1,97 @@
+package com.op.device.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.RequiresPermissions;
+import com.op.device.domain.SparePartsLedger;
+import com.op.device.service.ISparePartsLedgerService;
+import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.core.utils.poi.ExcelUtil;
+import com.op.common.core.web.page.TableDataInfo;
+
+/**
+ * 备品备件台账管理Controller
+ * 
+ * @author Open Platform
+ * @date 2023-10-13
+ */
+@RestController
+@RequestMapping("/sparePartsLedger")
+public class SparePartsLedgerController extends BaseController {
+	@Autowired
+	private ISparePartsLedgerService sparePartsLedgerService;
+
+	/**
+	 * 查询备品备件台账管理列表
+	 */
+	@RequiresPermissions("device:sparePartsLedger:list")
+	@GetMapping("/list")
+	public TableDataInfo list(SparePartsLedger sparePartsLedger) {
+		startPage();
+		List<SparePartsLedger> list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 导出备品备件台账管理列表
+	 */
+	@RequiresPermissions("device:sparePartsLedger:export")
+	@Log(title = "备品备件台账管理", businessType = BusinessType.EXPORT)
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SparePartsLedger sparePartsLedger) {
+		List<SparePartsLedger> list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger);
+		ExcelUtil<SparePartsLedger> util = new ExcelUtil<SparePartsLedger>(SparePartsLedger.class);
+		util.exportExcel(response, list, "备品备件台账管理数据");
+	}
+
+	/**
+	 * 获取备品备件台账管理详细信息
+	 */
+	@RequiresPermissions("device:sparePartsLedger:query")
+	@GetMapping(value = "/{storageId}")
+	public AjaxResult getInfo(@PathVariable("storageId") String storageId) {
+		return success(sparePartsLedgerService.selectSparePartsLedgerByStorageId(storageId));
+	}
+
+	/**
+	 * 新增备品备件台账管理
+	 */
+	@RequiresPermissions("device:sparePartsLedger:add")
+	@Log(title = "备品备件台账管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody SparePartsLedger sparePartsLedger) {
+		return toAjax(sparePartsLedgerService.insertSparePartsLedger(sparePartsLedger));
+	}
+
+	/**
+	 * 修改备品备件台账管理
+	 */
+	@RequiresPermissions("device:sparePartsLedger:edit")
+	@Log(title = "备品备件台账管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody SparePartsLedger sparePartsLedger) {
+		return toAjax(sparePartsLedgerService.updateSparePartsLedger(sparePartsLedger));
+	}
+
+	/**
+	 * 删除备品备件台账管理
+	 */
+	@RequiresPermissions("device:sparePartsLedger:remove")
+	@Log(title = "备品备件台账管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{storageIds}")
+	public AjaxResult remove(@PathVariable String[] storageIds) {
+		return toAjax(sparePartsLedgerService.deleteSparePartsLedgerByStorageIds(storageIds));
+	}
+}

op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java

@@ -0,0 +1,352 @@
+package com.op.device.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 备品备件出入库对象 wms_raw_order_in_sn
+ * 
+ * @author Open Platform
+ * @date 2023-10-17
+ */
+public class SparePartsInStorage extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** 唯一序列号 */
+	private String rawOrderInSnId;
+
+	/** 仓库编码 */
+	@Excel(name = "仓库编码")
+	private String whCode;
+
+	/** 库区编码 */
+	@Excel(name = "库区编码")
+	private String waCode;
+
+	/** 库位编码 */
+	@Excel(name = "库位编码")
+	private String wlCode;
+
+	/** 入库单号 */
+	@Excel(name = "入库单号")
+	private String orderNo;
+
+	/** 采购订单号 */
+	@Excel(name = "采购订单号")
+	private String poNo;
+
+	/** 采购订单行项目 */
+	@Excel(name = "采购订单行项目")
+	private String poLine;
+
+	/** 物料号 */
+	@Excel(name = "物料号")
+	private String materialCode;
+
+	/** 物料描述 */
+	@Excel(name = "物料描述")
+	private String materialDesc;
+
+	/** sn/LPN */
+	@Excel(name = "sn/LPN")
+	private String sn;
+
+	/** 数量 */
+	@Excel(name = "数量")
+	private BigDecimal amount;
+
+	/** 备用1 */
+	@Excel(name = "备用1")
+	private String userDefined1;
+
+	/** 备用2 */
+	@Excel(name = "备用2")
+	private String userDefined2;
+
+	/** 备用3 */
+	@Excel(name = "备用3")
+	private String userDefined3;
+
+	/** 备用4 */
+	@Excel(name = "备用4")
+	private String userDefined4;
+
+	/** 备用5 */
+	@Excel(name = "备用5")
+	private String userDefined5;
+
+	/** 备用6 */
+	@Excel(name = "备用6")
+	private String userDefined6;
+
+	/** 备用7 */
+	@Excel(name = "备用7")
+	private String userDefined7;
+
+	/** 备用8 */
+	@Excel(name = "备用8")
+	private String userDefined8;
+
+	/** 备用9 */
+	@Excel(name = "备用9")
+	private String userDefined9;
+
+	/** 备用10 */
+	@Excel(name = "备用10")
+	private String userDefined10;
+
+	/** 创建时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date gmtCreate;
+
+	/** 最后更新人 */
+	@Excel(name = "最后更新人")
+	private String lastModifiedBy;
+
+	/** 最后更新时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date gmtModified;
+
+	/** 有效标记 */
+	@Excel(name = "有效标记")
+	private String activeFlag;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+	private String factoryCode;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+	private String sapFactoryCode;
+
+	public void setRawOrderInSnId(String rawOrderInSnId) {
+		this.rawOrderInSnId = rawOrderInSnId;
+	}
+
+	public String getRawOrderInSnId() {
+		return rawOrderInSnId;
+	}
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+
+	public String getWhCode() {
+		return whCode;
+	}
+	public void setWaCode(String waCode) {
+		this.waCode = waCode;
+	}
+
+	public String getWaCode() {
+		return waCode;
+	}
+	public void setWlCode(String wlCode) {
+		this.wlCode = wlCode;
+	}
+
+	public String getWlCode() {
+		return wlCode;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setPoNo(String poNo) {
+		this.poNo = poNo;
+	}
+
+	public String getPoNo() {
+		return poNo;
+	}
+	public void setPoLine(String poLine) {
+		this.poLine = poLine;
+	}
+
+	public String getPoLine() {
+		return poLine;
+	}
+	public void setMaterialCode(String materialCode) {
+		this.materialCode = materialCode;
+	}
+
+	public String getMaterialCode() {
+		return materialCode;
+	}
+	public void setMaterialDesc(String materialDesc) {
+		this.materialDesc = materialDesc;
+	}
+
+	public String getMaterialDesc() {
+		return materialDesc;
+	}
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+
+	public String getSn() {
+		return sn;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setUserDefined1(String userDefined1) {
+		this.userDefined1 = userDefined1;
+	}
+
+	public String getUserDefined1() {
+		return userDefined1;
+	}
+	public void setUserDefined2(String userDefined2) {
+		this.userDefined2 = userDefined2;
+	}
+
+	public String getUserDefined2() {
+		return userDefined2;
+	}
+	public void setUserDefined3(String userDefined3) {
+		this.userDefined3 = userDefined3;
+	}
+
+	public String getUserDefined3() {
+		return userDefined3;
+	}
+	public void setUserDefined4(String userDefined4) {
+		this.userDefined4 = userDefined4;
+	}
+
+	public String getUserDefined4() {
+		return userDefined4;
+	}
+	public void setUserDefined5(String userDefined5) {
+		this.userDefined5 = userDefined5;
+	}
+
+	public String getUserDefined5() {
+		return userDefined5;
+	}
+	public void setUserDefined6(String userDefined6) {
+		this.userDefined6 = userDefined6;
+	}
+
+	public String getUserDefined6() {
+		return userDefined6;
+	}
+	public void setUserDefined7(String userDefined7) {
+		this.userDefined7 = userDefined7;
+	}
+
+	public String getUserDefined7() {
+		return userDefined7;
+	}
+	public void setUserDefined8(String userDefined8) {
+		this.userDefined8 = userDefined8;
+	}
+
+	public String getUserDefined8() {
+		return userDefined8;
+	}
+	public void setUserDefined9(String userDefined9) {
+		this.userDefined9 = userDefined9;
+	}
+
+	public String getUserDefined9() {
+		return userDefined9;
+	}
+	public void setUserDefined10(String userDefined10) {
+		this.userDefined10 = userDefined10;
+	}
+
+	public String getUserDefined10() {
+		return userDefined10;
+	}
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+	public void setLastModifiedBy(String lastModifiedBy) {
+		this.lastModifiedBy = lastModifiedBy;
+	}
+
+	public String getLastModifiedBy() {
+		return lastModifiedBy;
+	}
+	public void setGmtModified(Date gmtModified) {
+		this.gmtModified = gmtModified;
+	}
+
+	public Date getGmtModified() {
+		return gmtModified;
+	}
+	public void setActiveFlag(String activeFlag) {
+		this.activeFlag = activeFlag;
+	}
+
+	public String getActiveFlag() {
+		return activeFlag;
+	}
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+	public void setSapFactoryCode(String sapFactoryCode) {
+		this.sapFactoryCode = sapFactoryCode;
+	}
+
+	public String getSapFactoryCode() {
+		return sapFactoryCode;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("rawOrderInSnId", getRawOrderInSnId())
+			.append("whCode", getWhCode())
+			.append("waCode", getWaCode())
+			.append("wlCode", getWlCode())
+			.append("orderNo", getOrderNo())
+			.append("poNo", getPoNo())
+			.append("poLine", getPoLine())
+			.append("materialCode", getMaterialCode())
+			.append("materialDesc", getMaterialDesc())
+			.append("sn", getSn())
+			.append("amount", getAmount())
+			.append("userDefined1", getUserDefined1())
+			.append("userDefined2", getUserDefined2())
+			.append("userDefined3", getUserDefined3())
+			.append("userDefined4", getUserDefined4())
+			.append("userDefined5", getUserDefined5())
+			.append("userDefined6", getUserDefined6())
+			.append("userDefined7", getUserDefined7())
+			.append("userDefined8", getUserDefined8())
+			.append("userDefined9", getUserDefined9())
+			.append("userDefined10", getUserDefined10())
+			.append("createBy", getCreateBy())
+			.append("gmtCreate", getGmtCreate())
+			.append("lastModifiedBy", getLastModifiedBy())
+			.append("gmtModified", getGmtModified())
+			.append("activeFlag", getActiveFlag())
+			.append("factoryCode", getFactoryCode())
+			.append("sapFactoryCode", getSapFactoryCode())
+			.toString();
+	}
+}

op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java

@@ -0,0 +1,568 @@
+package com.op.device.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 备品备件台账管理对象 wms_ods_mate_storage_news
+ * 
+ * @author Open Platform
+ * @date 2023-10-13
+ */
+public class SparePartsLedger extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** 唯一序列 */
+	@Excel(name = "唯一序列")
+	private String storageId;
+
+	/** 仓库编码 */
+	@Excel(name = "仓库编码")
+	private String whCode;
+
+	/** 区域编号 */
+	@Excel(name = "区域编号")
+	private String regionCode;
+
+	/** 库区编码 */
+	@Excel(name = "库区编码")
+	private String waCode;
+
+	/** 库存类型：BC－包材 */
+	@Excel(name = "库存类型：BC－包材")
+	private String storageType;
+
+	/** 库位编码 */
+	@Excel(name = "库位编码")
+	private String wlCode;
+
+	/** 物料号 */
+	@Excel(name = "物料号")
+	private String materialCode;
+
+	/** 物料描述 */
+	@Excel(name = "物料描述")
+	private String materialDesc;
+
+	/** 总数量 */
+	@Excel(name = "总数量")
+	private BigDecimal amount;
+
+	/** 冻结数量（预留） */
+	@Excel(name = "冻结数量", readConverterExp = "预=留")
+	private BigDecimal storageAmount;
+
+	/** 占用数量 */
+	@Excel(name = "占用数量")
+	private BigDecimal occupyAmount;
+
+	/** LPN（预留） */
+	@Excel(name = "LPN", readConverterExp = "预=留")
+	private String lpn;
+
+	/** 入库批次号（预留） */
+	@Excel(name = "入库批次号", readConverterExp = "预=留")
+	private String productBatch;
+
+	/** 入库时间x（预留） */
+	@Excel(name = "入库时间x", readConverterExp = "预=留")
+	private Date receiveDate;
+
+	/** 生产时间（预留） */
+	@Excel(name = "生产时间", readConverterExp = "预=留")
+	private Date productDate;
+
+	/** 单位 */
+	@Excel(name = "单位")
+	private String userDefined1;
+
+	/** SAP库位 */
+	@Excel(name = "SAP库位")
+	private String userDefined2;
+
+	/** 备用3 */
+	@Excel(name = "备用3")
+	private String userDefined3;
+
+	/** 备用4 */
+	@Excel(name = "备用4")
+	private String userDefined4;
+
+	/** 备用5 */
+	@Excel(name = "备用5")
+	private String userDefined5;
+
+	/** 备用6 */
+	@Excel(name = "备用6")
+	private String userDefined6;
+
+	/** 备用7 */
+	@Excel(name = "备用7")
+	private String userDefined7;
+
+	/** 备用8 */
+	@Excel(name = "备用8")
+	private String userDefined8;
+
+	/** 备用9 */
+	@Excel(name = "备用9")
+	private String userDefined9;
+
+	/** 备用10 */
+	@Excel(name = "备用10")
+	private String userDefined10;
+
+	/** 创建时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date gmtCreate;
+
+	/** 最后更新人 */
+	@Excel(name = "最后更新人")
+	private String lastModifiedBy;
+
+	/** 最后更新时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date gmtModified;
+
+	/** 有效标记 */
+	@Excel(name = "有效标记")
+	private String activeFlag;
+
+	/** 工厂号 */
+	@Excel(name = "工厂号")
+	private String factoryCode;
+
+	/** SAP工厂号 */
+	@Excel(name = "SAP工厂号")
+	private String sapFactoryCode;
+
+	/** 库位名称 */
+	@Excel(name = "库位名称")
+	private String wlName;
+
+	/** 0存在 */
+	private String delFlag;
+
+	/** 使用寿命（备件用） */
+	@Excel(name = "使用寿命", readConverterExp = "备=件用")
+	private String spareUseLife;
+
+	/** 备件名称（备件用） */
+	@Excel(name = "备件名称", readConverterExp = "备=件用")
+	private String spareName;
+
+	/** 规格型号（备件用） */
+	@Excel(name = "规格型号", readConverterExp = "备=件用")
+	private String spareMode;
+
+	/** 生产厂商（备件用） */
+	@Excel(name = "生产厂商", readConverterExp = "备=件用")
+	private String spareManufacturer;
+
+	/** 供应商（备件用） */
+	@Excel(name = "供应商", readConverterExp = "备=件用")
+	private String spareSupplier;
+
+	/** 循环周期（备件用） */
+	@Excel(name = "循环周期", readConverterExp = "备=件用")
+	private String spareReplacementCycle;
+
+	/** 计量单位（备件用） */
+	@Excel(name = "计量单位", readConverterExp = "备=件用")
+	private String spareMeasurementUnit;
+
+	/** 换算单位（备件用） */
+	@Excel(name = "换算单位", readConverterExp = "备=件用")
+	private String spareConversionUnit;
+
+	/** 换算比例（备件用） */
+	@Excel(name = "换算比例", readConverterExp = "备=件用")
+	private String spareConversionRatio;
+
+	/** 库存上限（备件用） */
+	@Excel(name = "库存上限", readConverterExp = "备=件用")
+	private String spareInventoryFloor;
+
+	/** 库存下限（备件用） */
+	@Excel(name = "库存下限", readConverterExp = "备=件用")
+	private String spareInventoryUpper;
+
+	/** 备件类型 */
+	@Excel(name = "备件类型", readConverterExp = "备=件用")
+	private String spareType;
+
+	public void setSpareType(String spareType) {
+		this.spareType = spareType;
+	}
+
+	public String getSpareType() {
+		return spareType;
+	}
+
+	public void setStorageId(String storageId) {
+		this.storageId = storageId;
+	}
+
+	public String getStorageId() {
+		return storageId;
+	}
+	public void setWhCode(String whCode) {
+		this.whCode = whCode;
+	}
+
+	public String getWhCode() {
+		return whCode;
+	}
+	public void setRegionCode(String regionCode) {
+		this.regionCode = regionCode;
+	}
+
+	public String getRegionCode() {
+		return regionCode;
+	}
+	public void setWaCode(String waCode) {
+		this.waCode = waCode;
+	}
+
+	public String getWaCode() {
+		return waCode;
+	}
+	public void setStorageType(String storageType) {
+		this.storageType = storageType;
+	}
+
+	public String getStorageType() {
+		return storageType;
+	}
+	public void setWlCode(String wlCode) {
+		this.wlCode = wlCode;
+	}
+
+	public String getWlCode() {
+		return wlCode;
+	}
+	public void setMaterialCode(String materialCode) {
+		this.materialCode = materialCode;
+	}
+
+	public String getMaterialCode() {
+		return materialCode;
+	}
+	public void setMaterialDesc(String materialDesc) {
+		this.materialDesc = materialDesc;
+	}
+
+	public String getMaterialDesc() {
+		return materialDesc;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setStorageAmount(BigDecimal storageAmount) {
+		this.storageAmount = storageAmount;
+	}
+
+	public BigDecimal getStorageAmount() {
+		return storageAmount;
+	}
+	public void setOccupyAmount(BigDecimal occupyAmount) {
+		this.occupyAmount = occupyAmount;
+	}
+
+	public BigDecimal getOccupyAmount() {
+		return occupyAmount;
+	}
+	public void setLpn(String lpn) {
+		this.lpn = lpn;
+	}
+
+	public String getLpn() {
+		return lpn;
+	}
+	public void setProductBatch(String productBatch) {
+		this.productBatch = productBatch;
+	}
+
+	public String getProductBatch() {
+		return productBatch;
+	}
+	public void setReceiveDate(Date receiveDate) {
+		this.receiveDate = receiveDate;
+	}
+
+	public Date getReceiveDate() {
+		return receiveDate;
+	}
+	public void setProductDate(Date productDate) {
+		this.productDate = productDate;
+	}
+
+	public Date getProductDate() {
+		return productDate;
+	}
+	public void setUserDefined1(String userDefined1) {
+		this.userDefined1 = userDefined1;
+	}
+
+	public String getUserDefined1() {
+		return userDefined1;
+	}
+	public void setUserDefined2(String userDefined2) {
+		this.userDefined2 = userDefined2;
+	}
+
+	public String getUserDefined2() {
+		return userDefined2;
+	}
+	public void setUserDefined3(String userDefined3) {
+		this.userDefined3 = userDefined3;
+	}
+
+	public String getUserDefined3() {
+		return userDefined3;
+	}
+	public void setUserDefined4(String userDefined4) {
+		this.userDefined4 = userDefined4;
+	}
+
+	public String getUserDefined4() {
+		return userDefined4;
+	}
+	public void setUserDefined5(String userDefined5) {
+		this.userDefined5 = userDefined5;
+	}
+
+	public String getUserDefined5() {
+		return userDefined5;
+	}
+	public void setUserDefined6(String userDefined6) {
+		this.userDefined6 = userDefined6;
+	}
+
+	public String getUserDefined6() {
+		return userDefined6;
+	}
+	public void setUserDefined7(String userDefined7) {
+		this.userDefined7 = userDefined7;
+	}
+
+	public String getUserDefined7() {
+		return userDefined7;
+	}
+	public void setUserDefined8(String userDefined8) {
+		this.userDefined8 = userDefined8;
+	}
+
+	public String getUserDefined8() {
+		return userDefined8;
+	}
+	public void setUserDefined9(String userDefined9) {
+		this.userDefined9 = userDefined9;
+	}
+
+	public String getUserDefined9() {
+		return userDefined9;
+	}
+	public void setUserDefined10(String userDefined10) {
+		this.userDefined10 = userDefined10;
+	}
+
+	public String getUserDefined10() {
+		return userDefined10;
+	}
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+	public void setLastModifiedBy(String lastModifiedBy) {
+		this.lastModifiedBy = lastModifiedBy;
+	}
+
+	public String getLastModifiedBy() {
+		return lastModifiedBy;
+	}
+	public void setGmtModified(Date gmtModified) {
+		this.gmtModified = gmtModified;
+	}
+
+	public Date getGmtModified() {
+		return gmtModified;
+	}
+	public void setActiveFlag(String activeFlag) {
+		this.activeFlag = activeFlag;
+	}
+
+	public String getActiveFlag() {
+		return activeFlag;
+	}
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+	public void setSapFactoryCode(String sapFactoryCode) {
+		this.sapFactoryCode = sapFactoryCode;
+	}
+
+	public String getSapFactoryCode() {
+		return sapFactoryCode;
+	}
+	public void setWlName(String wlName) {
+		this.wlName = wlName;
+	}
+
+	public String getWlName() {
+		return wlName;
+	}
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+
+	public String getDelFlag() {
+		return delFlag;
+	}
+	public void setSpareUseLife(String spareUseLife) {
+		this.spareUseLife = spareUseLife;
+	}
+
+	public String getSpareUseLife() {
+		return spareUseLife;
+	}
+	public void setSpareName(String spareName) {
+		this.spareName = spareName;
+	}
+
+	public String getSpareName() {
+		return spareName;
+	}
+	public void setSpareMode(String spareMode) {
+		this.spareMode = spareMode;
+	}
+
+	public String getSpareMode() {
+		return spareMode;
+	}
+	public void setSpareManufacturer(String spareManufacturer) {
+		this.spareManufacturer = spareManufacturer;
+	}
+
+	public String getSpareManufacturer() {
+		return spareManufacturer;
+	}
+	public void setSpareSupplier(String spareSupplier) {
+		this.spareSupplier = spareSupplier;
+	}
+
+	public String getSpareSupplier() {
+		return spareSupplier;
+	}
+	public void setSpareReplacementCycle(String spareReplacementCycle) {
+		this.spareReplacementCycle = spareReplacementCycle;
+	}
+
+	public String getSpareReplacementCycle() {
+		return spareReplacementCycle;
+	}
+	public void setSpareMeasurementUnit(String spareMeasurementUnit) {
+		this.spareMeasurementUnit = spareMeasurementUnit;
+	}
+
+	public String getSpareMeasurementUnit() {
+		return spareMeasurementUnit;
+	}
+	public void setSpareConversionUnit(String spareConversionUnit) {
+		this.spareConversionUnit = spareConversionUnit;
+	}
+
+	public String getSpareConversionUnit() {
+		return spareConversionUnit;
+	}
+	public void setSpareConversionRatio(String spareConversionRatio) {
+		this.spareConversionRatio = spareConversionRatio;
+	}
+
+	public String getSpareConversionRatio() {
+		return spareConversionRatio;
+	}
+	public void setSpareInventoryFloor(String spareInventoryFloor) {
+		this.spareInventoryFloor = spareInventoryFloor;
+	}
+
+	public String getSpareInventoryFloor() {
+		return spareInventoryFloor;
+	}
+	public void setSpareInventoryUpper(String spareInventoryUpper) {
+		this.spareInventoryUpper = spareInventoryUpper;
+	}
+
+	public String getSpareInventoryUpper() {
+		return spareInventoryUpper;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("storageId", getStorageId())
+			.append("whCode", getWhCode())
+			.append("regionCode", getRegionCode())
+			.append("waCode", getWaCode())
+			.append("storageType", getStorageType())
+			.append("wlCode", getWlCode())
+			.append("materialCode", getMaterialCode())
+			.append("materialDesc", getMaterialDesc())
+			.append("amount", getAmount())
+			.append("storageAmount", getStorageAmount())
+			.append("occupyAmount", getOccupyAmount())
+			.append("lpn", getLpn())
+			.append("productBatch", getProductBatch())
+			.append("receiveDate", getReceiveDate())
+			.append("productDate", getProductDate())
+			.append("userDefined1", getUserDefined1())
+			.append("userDefined2", getUserDefined2())
+			.append("userDefined3", getUserDefined3())
+			.append("userDefined4", getUserDefined4())
+			.append("userDefined5", getUserDefined5())
+			.append("userDefined6", getUserDefined6())
+			.append("userDefined7", getUserDefined7())
+			.append("userDefined8", getUserDefined8())
+			.append("userDefined9", getUserDefined9())
+			.append("userDefined10", getUserDefined10())
+			.append("createBy", getCreateBy())
+			.append("gmtCreate", getGmtCreate())
+			.append("lastModifiedBy", getLastModifiedBy())
+			.append("gmtModified", getGmtModified())
+			.append("activeFlag", getActiveFlag())
+			.append("factoryCode", getFactoryCode())
+			.append("sapFactoryCode", getSapFactoryCode())
+			.append("wlName", getWlName())
+			.append("delFlag", getDelFlag())
+			.append("spareUseLife", getSpareUseLife())
+			.append("spareName", getSpareName())
+			.append("spareMode", getSpareMode())
+			.append("spareManufacturer", getSpareManufacturer())
+			.append("spareSupplier", getSpareSupplier())
+			.append("spareReplacementCycle", getSpareReplacementCycle())
+			.append("spareMeasurementUnit", getSpareMeasurementUnit())
+			.append("spareConversionUnit", getSpareConversionUnit())
+			.append("spareConversionRatio", getSpareConversionRatio())
+			.append("spareInventoryFloor", getSpareInventoryFloor())
+			.append("spareInventoryUpper", getSpareInventoryUpper())
+			.toString();
+	}
+}

op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java

@@ -0,0 +1,61 @@
+package com.op.device.mapper;
+
+import java.util.List;
+
+import com.op.device.domain.SparePartsInStorage;
+
+/**
+ * 备品备件出入库Mapper接口
+ * 
+ * @author Open Platform
+ * @date 2023-10-17
+ */
+public interface SparePartsInOutStorageMapper {
+	/**
+	 * 查询备品备件出入库
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 备品备件出入库
+	 */
+	public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId);
+
+	/**
+	 * 查询备品备件出入库列表
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 备品备件出入库集合
+	 */
+	public List<SparePartsInStorage> selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 新增备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 修改备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 删除备品备件出入库
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 结果
+	 */
+	public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId);
+
+	/**
+	 * 批量删除备品备件出入库
+	 * 
+	 * @param rawOrderInSnIds 需要删除的数据主键集合
+	 * @return 结果
+	 */
+	public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds);
+}

op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java

@@ -0,0 +1,61 @@
+package com.op.device.mapper;
+
+import java.util.List;
+
+import com.op.device.domain.SparePartsLedger;
+
+/**
+ * 备品备件台账管理Mapper接口
+ * 
+ * @author Open Platform
+ * @date 2023-10-13
+ */
+public interface SparePartsLedgerMapper {
+	/**
+	 * 查询备品备件台账管理
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 备品备件台账管理
+	 */
+	public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId);
+
+	/**
+	 * 查询备品备件台账管理列表
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 备品备件台账管理集合
+	 */
+	public List<SparePartsLedger> selectSparePartsLedgerList(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 新增备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	public int insertSparePartsLedger(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 修改备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	public int updateSparePartsLedger(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 删除备品备件台账管理
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 结果
+	 */
+	public int deleteSparePartsLedgerByStorageId(String storageId);
+
+	/**
+	 * 批量删除备品备件台账管理
+	 * 
+	 * @param storageIds 需要删除的数据主键集合
+	 * @return 结果
+	 */
+	public int deleteSparePartsLedgerByStorageIds(String[] storageIds);
+}

op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java

@@ -0,0 +1,60 @@
+package com.op.device.service;
+
+import java.util.List;
+import com.op.device.domain.SparePartsInStorage;
+
+/**
+ * 备品备件出入库Service接口
+ * 
+ * @author Open Platform
+ * @date 2023-10-17
+ */
+public interface ISparePartsInOutStorageService {
+	/**
+	 * 查询备品备件出入库
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 备品备件出入库
+	 */
+	public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId);
+
+	/**
+	 * 查询备品备件出入库列表
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 备品备件出入库集合
+	 */
+	public List<SparePartsInStorage> selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 新增备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 修改备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage);
+
+	/**
+	 * 批量删除备品备件出入库
+	 * 
+	 * @param rawOrderInSnIds 需要删除的备品备件出入库主键集合
+	 * @return 结果
+	 */
+	public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds);
+
+	/**
+	 * 删除备品备件出入库信息
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 结果
+	 */
+	public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId);
+}

op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java

@@ -0,0 +1,61 @@
+package com.op.device.service;
+
+import java.util.List;
+
+import com.op.device.domain.SparePartsLedger;
+
+/**
+ * 备品备件台账管理Service接口
+ * 
+ * @author Open Platform
+ * @date 2023-10-13
+ */
+public interface ISparePartsLedgerService {
+	/**
+	 * 查询备品备件台账管理
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 备品备件台账管理
+	 */
+	public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId);
+
+	/**
+	 * 查询备品备件台账管理列表
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 备品备件台账管理集合
+	 */
+	public List<SparePartsLedger> selectSparePartsLedgerList(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 新增备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	public int insertSparePartsLedger(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 修改备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	public int updateSparePartsLedger(SparePartsLedger sparePartsLedger);
+
+	/**
+	 * 批量删除备品备件台账管理
+	 * 
+	 * @param storageIds 需要删除的备品备件台账管理主键集合
+	 * @return 结果
+	 */
+	public int deleteSparePartsLedgerByStorageIds(String[] storageIds);
+
+	/**
+	 * 删除备品备件台账管理信息
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 结果
+	 */
+	public int deleteSparePartsLedgerByStorageId(String storageId);
+}

op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java

@@ -0,0 +1,94 @@
+package com.op.device.service.impl;
+
+import java.util.List;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.device.mapper.SparePartsInOutStorageMapper;
+import com.op.device.domain.SparePartsInStorage;
+import com.op.device.service.ISparePartsInOutStorageService;
+
+/**
+ * 备品备件出入库Service业务层处理
+ * 
+ * @author Open Platform
+ * @date 2023-10-17
+ */
+@Service
+public class SparePartsInOutStorageServiceImpl implements ISparePartsInOutStorageService {
+	@Autowired
+	private SparePartsInOutStorageMapper sparePartsInOutStorageMapper;
+
+	/**
+	 * 查询备品备件出入库
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 备品备件出入库
+	 */
+	@Override
+	@DS("#header.poolName")
+	public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) {
+		return sparePartsInOutStorageMapper.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId);
+	}
+
+	/**
+	 * 查询备品备件出入库列表
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 备品备件出入库
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<SparePartsInStorage> selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage) {
+		return sparePartsInOutStorageMapper.selectSparePartsInStorageList(sparePartsInStorage);
+	}
+
+	/**
+	 * 新增备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage) {
+		return sparePartsInOutStorageMapper.insertSparePartsInStorage(sparePartsInStorage);
+	}
+
+	/**
+	 * 修改备品备件出入库
+	 * 
+	 * @param sparePartsInStorage 备品备件出入库
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage) {
+		return sparePartsInOutStorageMapper.updateSparePartsInStorage(sparePartsInStorage);
+	}
+
+	/**
+	 * 批量删除备品备件出入库
+	 * 
+	 * @param rawOrderInSnIds 需要删除的备品备件出入库主键
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds) {
+		return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds);
+	}
+
+	/**
+	 * 删除备品备件出入库信息
+	 * 
+	 * @param rawOrderInSnId 备品备件出入库主键
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) {
+		return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnId(rawOrderInSnId);
+	}
+}

op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java

@@ -0,0 +1,95 @@
+package com.op.device.service.impl;
+
+import java.util.List;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.device.mapper.SparePartsLedgerMapper;
+import com.op.device.domain.SparePartsLedger;
+import com.op.device.service.ISparePartsLedgerService;
+
+/**
+ * 备品备件台账管理Service业务层处理
+ * 
+ * @author Open Platform
+ * @date 2023-10-13
+ */
+@Service
+public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
+	@Autowired
+	private SparePartsLedgerMapper sparePartsLedgerMapper;
+
+	/**
+	 * 查询备品备件台账管理
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 备品备件台账管理
+	 */
+	@Override
+	@DS("#header.poolName")
+	public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId) {
+		return sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(storageId);
+	}
+
+	/**
+	 * 查询备品备件台账管理列表
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 备品备件台账管理
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<SparePartsLedger> selectSparePartsLedgerList(SparePartsLedger sparePartsLedger) {
+		sparePartsLedger.setStorageType("SP");
+		return sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger);
+	}
+
+	/**
+	 * 新增备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int insertSparePartsLedger(SparePartsLedger sparePartsLedger) {
+		return sparePartsLedgerMapper.insertSparePartsLedger(sparePartsLedger);
+	}
+
+	/**
+	 * 修改备品备件台账管理
+	 * 
+	 * @param sparePartsLedger 备品备件台账管理
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int updateSparePartsLedger(SparePartsLedger sparePartsLedger) {
+		return sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
+	}
+
+	/**
+	 * 批量删除备品备件台账管理
+	 * 
+	 * @param storageIds 需要删除的备品备件台账管理主键
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int deleteSparePartsLedgerByStorageIds(String[] storageIds) {
+		return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageIds(storageIds);
+	}
+
+	/**
+	 * 删除备品备件台账管理信息
+	 * 
+	 * @param storageId 备品备件台账管理主键
+	 * @return 结果
+	 */
+	@Override
+	@DS("#header.poolName")
+	public int deleteSparePartsLedgerByStorageId(String storageId) {
+		return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageId(storageId);
+	}
+}

op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml

@@ -0,0 +1,187 @@
+<?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.op.device.mapper.SparePartsInOutStorageMapper">
+	
+	<resultMap type="SparePartsInStorage" id="SparePartsInStorageResult">
+		<result property="rawOrderInSnId"	column="raw_order_in_sn_id"	/>
+		<result property="whCode"	column="wh_code"	/>
+		<result property="waCode"	column="wa_code"	/>
+		<result property="wlCode"	column="wl_code"	/>
+		<result property="orderNo"	column="order_no"	/>
+		<result property="poNo"	column="po_no"	/>
+		<result property="poLine"	column="po_line"	/>
+		<result property="materialCode"	column="material_code"	/>
+		<result property="materialDesc"	column="material_desc"	/>
+		<result property="sn"	column="sn"	/>
+		<result property="amount"	column="amount"	/>
+		<result property="userDefined1"	column="user_defined1"	/>
+		<result property="userDefined2"	column="user_defined2"	/>
+		<result property="userDefined3"	column="user_defined3"	/>
+		<result property="userDefined4"	column="user_defined4"	/>
+		<result property="userDefined5"	column="user_defined5"	/>
+		<result property="userDefined6"	column="user_defined6"	/>
+		<result property="userDefined7"	column="user_defined7"	/>
+		<result property="userDefined8"	column="user_defined8"	/>
+		<result property="userDefined9"	column="user_defined9"	/>
+		<result property="userDefined10"	column="user_defined10"	/>
+		<result property="createBy"	column="create_by"	/>
+		<result property="gmtCreate"	column="gmt_create"	/>
+		<result property="lastModifiedBy"	column="last_modified_by"	/>
+		<result property="gmtModified"	column="gmt_modified"	/>
+		<result property="activeFlag"	column="active_flag"	/>
+		<result property="factoryCode"	column="factory_code"	/>
+		<result property="sapFactoryCode"	column="sap_factory_code"	/>
+	</resultMap>
+
+	<sql id="selectSparePartsInStorageVo">
+		select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn
+	</sql>
+
+	<select id="selectSparePartsInStorageList" parameterType="SparePartsInStorage" resultMap="SparePartsInStorageResult">
+		<include refid="selectSparePartsInStorageVo"/>
+		<where>  
+			<if test="whCode != null  and whCode != ''"> and wh_code = #{whCode}</if>
+			<if test="waCode != null  and waCode != ''"> and wa_code = #{waCode}</if>
+			<if test="wlCode != null  and wlCode != ''"> and wl_code = #{wlCode}</if>
+			<if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+			<if test="poNo != null  and poNo != ''"> and po_no = #{poNo}</if>
+			<if test="poLine != null  and poLine != ''"> and po_line = #{poLine}</if>
+			<if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+			<if test="materialDesc != null  and materialDesc != ''"> and material_desc = #{materialDesc}</if>
+			<if test="sn != null  and sn != ''"> and sn = #{sn}</if>
+			<if test="amount != null "> and amount = #{amount}</if>
+			<if test="userDefined1 != null  and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
+			<if test="userDefined2 != null  and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
+			<if test="userDefined3 != null  and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
+			<if test="userDefined4 != null  and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
+			<if test="userDefined5 != null  and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
+			<if test="userDefined6 != null  and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
+			<if test="userDefined7 != null  and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
+			<if test="userDefined8 != null  and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
+			<if test="userDefined9 != null  and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
+			<if test="userDefined10 != null  and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
+			<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
+			<if test="lastModifiedBy != null  and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
+			<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
+			<if test="activeFlag != null  and activeFlag != ''"> and active_flag = #{activeFlag}</if>
+			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="sapFactoryCode != null  and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
+		</where>
+	</select>
+	
+	<select id="selectSparePartsInStorageByRawOrderInSnId" parameterType="String" resultMap="SparePartsInStorageResult">
+		<include refid="selectSparePartsInStorageVo"/>
+		where raw_order_in_sn_id = #{rawOrderInSnId}
+	</select>
+		
+	<insert id="insertSparePartsInStorage" parameterType="SparePartsInStorage">
+		insert into wms_raw_order_in_sn
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="rawOrderInSnId != null">raw_order_in_sn_id,</if>
+			<if test="whCode != null">wh_code,</if>
+			<if test="waCode != null">wa_code,</if>
+			<if test="wlCode != null">wl_code,</if>
+			<if test="orderNo != null">order_no,</if>
+			<if test="poNo != null">po_no,</if>
+			<if test="poLine != null">po_line,</if>
+			<if test="materialCode != null">material_code,</if>
+			<if test="materialDesc != null">material_desc,</if>
+			<if test="sn != null">sn,</if>
+			<if test="amount != null">amount,</if>
+			<if test="userDefined1 != null">user_defined1,</if>
+			<if test="userDefined2 != null">user_defined2,</if>
+			<if test="userDefined3 != null">user_defined3,</if>
+			<if test="userDefined4 != null">user_defined4,</if>
+			<if test="userDefined5 != null">user_defined5,</if>
+			<if test="userDefined6 != null">user_defined6,</if>
+			<if test="userDefined7 != null">user_defined7,</if>
+			<if test="userDefined8 != null">user_defined8,</if>
+			<if test="userDefined9 != null">user_defined9,</if>
+			<if test="userDefined10 != null">user_defined10,</if>
+			<if test="createBy != null">create_by,</if>
+			<if test="gmtCreate != null">gmt_create,</if>
+			<if test="lastModifiedBy != null">last_modified_by,</if>
+			<if test="gmtModified != null">gmt_modified,</if>
+			<if test="activeFlag != null">active_flag,</if>
+			<if test="factoryCode != null">factory_code,</if>
+			<if test="sapFactoryCode != null">sap_factory_code,</if>
+		 </trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="rawOrderInSnId != null">#{rawOrderInSnId},</if>
+			<if test="whCode != null">#{whCode},</if>
+			<if test="waCode != null">#{waCode},</if>
+			<if test="wlCode != null">#{wlCode},</if>
+			<if test="orderNo != null">#{orderNo},</if>
+			<if test="poNo != null">#{poNo},</if>
+			<if test="poLine != null">#{poLine},</if>
+			<if test="materialCode != null">#{materialCode},</if>
+			<if test="materialDesc != null">#{materialDesc},</if>
+			<if test="sn != null">#{sn},</if>
+			<if test="amount != null">#{amount},</if>
+			<if test="userDefined1 != null">#{userDefined1},</if>
+			<if test="userDefined2 != null">#{userDefined2},</if>
+			<if test="userDefined3 != null">#{userDefined3},</if>
+			<if test="userDefined4 != null">#{userDefined4},</if>
+			<if test="userDefined5 != null">#{userDefined5},</if>
+			<if test="userDefined6 != null">#{userDefined6},</if>
+			<if test="userDefined7 != null">#{userDefined7},</if>
+			<if test="userDefined8 != null">#{userDefined8},</if>
+			<if test="userDefined9 != null">#{userDefined9},</if>
+			<if test="userDefined10 != null">#{userDefined10},</if>
+			<if test="createBy != null">#{createBy},</if>
+			<if test="gmtCreate != null">#{gmtCreate},</if>
+			<if test="lastModifiedBy != null">#{lastModifiedBy},</if>
+			<if test="gmtModified != null">#{gmtModified},</if>
+			<if test="activeFlag != null">#{activeFlag},</if>
+			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
+		 </trim>
+	</insert>
+
+	<update id="updateSparePartsInStorage" parameterType="SparePartsInStorage">
+		update wms_raw_order_in_sn
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="whCode != null">wh_code = #{whCode},</if>
+			<if test="waCode != null">wa_code = #{waCode},</if>
+			<if test="wlCode != null">wl_code = #{wlCode},</if>
+			<if test="orderNo != null">order_no = #{orderNo},</if>
+			<if test="poNo != null">po_no = #{poNo},</if>
+			<if test="poLine != null">po_line = #{poLine},</if>
+			<if test="materialCode != null">material_code = #{materialCode},</if>
+			<if test="materialDesc != null">material_desc = #{materialDesc},</if>
+			<if test="sn != null">sn = #{sn},</if>
+			<if test="amount != null">amount = #{amount},</if>
+			<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
+			<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
+			<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
+			<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
+			<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
+			<if test="userDefined6 != null">user_defined6 = #{userDefined6},</if>
+			<if test="userDefined7 != null">user_defined7 = #{userDefined7},</if>
+			<if test="userDefined8 != null">user_defined8 = #{userDefined8},</if>
+			<if test="userDefined9 != null">user_defined9 = #{userDefined9},</if>
+			<if test="userDefined10 != null">user_defined10 = #{userDefined10},</if>
+			<if test="createBy != null">create_by = #{createBy},</if>
+			<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
+			<if test="lastModifiedBy != null">last_modified_by = #{lastModifiedBy},</if>
+			<if test="gmtModified != null">gmt_modified = #{gmtModified},</if>
+			<if test="activeFlag != null">active_flag = #{activeFlag},</if>
+			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
+		</trim>
+		where raw_order_in_sn_id = #{rawOrderInSnId}
+	</update>
+
+	<delete id="deleteSparePartsInStorageByRawOrderInSnId" parameterType="String">
+		delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId}
+	</delete>
+
+	<delete id="deleteSparePartsInStorageByRawOrderInSnIds" parameterType="String">
+		delete from wms_raw_order_in_sn where raw_order_in_sn_id in 
+		<foreach item="rawOrderInSnId" collection="array" open="(" separator="," close=")">
+			#{rawOrderInSnId}
+		</foreach>
+	</delete>
+</mapper>

op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml

@@ -0,0 +1,258 @@
+<?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.op.device.mapper.SparePartsLedgerMapper">
+	
+	<resultMap type="SparePartsLedger" id="SparePartsLedgerResult">
+		<result property="materialCode"	column="material_code"	/>
+		<result property="materialDesc"	column="material_desc"	/>
+		<result property="amount"	column="amount"	/>
+		<result property="storageType"	column="storage_type"	/>
+		<result property="spareUseLife"	column="spare_use_life"	/>
+		<result property="spareName"	column="spare_name"	/>
+		<result property="spareMode"	column="spare_mode"	/>
+		<result property="spareManufacturer"	column="spare_manufacturer"	/>
+		<result property="spareSupplier"	column="spare_supplier"	/>
+		<result property="spareReplacementCycle"	column="spare_replacement_cycle"	/>
+		<result property="spareMeasurementUnit"	column="spare_measurement_unit"	/>
+		<result property="spareConversionUnit"	column="spare_conversion_unit"	/>
+		<result property="spareConversionRatio"	column="spare_conversion_ratio"	/>
+		<result property="spareInventoryFloor"	column="spare_inventory_floor"	/>
+		<result property="spareInventoryUpper"	column="spare_inventory_upper"	/>
+		<result property="spareType"	column="spare_type"	/>
+		<result property="createBy"	column="create_by"	/>
+		<result property="gmtCreate"	column="gmt_create"	/>
+		<result property="lastModifiedBy"	column="last_modified_by"	/>
+		<result property="gmtModified"	column="gmt_modified"	/>
+		<result property="activeFlag"	column="active_flag"	/>
+		<result property="factoryCode"	column="factory_code"	/>
+		<result property="sapFactoryCode"	column="sap_factory_code"	/>
+		<result property="delFlag"	column="del_flag"	/>
+	</resultMap>
+
+	<sql id="selectSparePartsLedgerVo">
+		select storage_type, material_code, material_desc, amount,sap_factory_code, wl_name, del_flag, spare_use_life, spare_name, spare_mode, spare_manufacturer, spare_supplier, spare_replacement_cycle, spare_measurement_unit, spare_conversion_unit, spare_conversion_ratio, spare_inventory_floor, spare_inventory_upper,spare_type,create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code from wms_ods_mate_storage_news
+	</sql>
+
+	<select id="selectSparePartsLedgerList" parameterType="SparePartsLedger" resultMap="SparePartsLedgerResult">
+		<include refid="selectSparePartsLedgerVo"/>
+		<where>  
+			<if test="storageId != null  and storageId != ''"> and storage_id = #{storageId}</if>
+			<if test="whCode != null  and whCode != ''"> and wh_code = #{whCode}</if>
+			<if test="regionCode != null  and regionCode != ''"> and region_code = #{regionCode}</if>
+			<if test="waCode != null  and waCode != ''"> and wa_code = #{waCode}</if>
+			<if test="storageType != null  and storageType != ''"> and storage_type = #{storageType}</if>
+			<if test="wlCode != null  and wlCode != ''"> and wl_code = #{wlCode}</if>
+			<if test="materialCode != null  and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
+			<if test="materialDesc != null  and materialDesc != ''"> and material_desc like concat('%', #{materialDesc}, '%')</if>
+			<if test="amount != null "> and amount = #{amount}</if>
+			<if test="storageAmount != null "> and storage_amount = #{storageAmount}</if>
+			<if test="occupyAmount != null "> and occupy_amount = #{occupyAmount}</if>
+			<if test="lpn != null  and lpn != ''"> and lpn = #{lpn}</if>
+			<if test="productBatch != null  and productBatch != ''"> and product_batch = #{productBatch}</if>
+			<if test="receiveDate != null "> and receive_date = #{receiveDate}</if>
+			<if test="productDate != null "> and product_date = #{productDate}</if>
+			<if test="userDefined1 != null  and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
+			<if test="userDefined2 != null  and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
+			<if test="userDefined3 != null  and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
+			<if test="userDefined4 != null  and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
+			<if test="userDefined5 != null  and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
+			<if test="userDefined6 != null  and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
+			<if test="userDefined7 != null  and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
+			<if test="userDefined8 != null  and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
+			<if test="userDefined9 != null  and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
+			<if test="userDefined10 != null  and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
+			<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
+			<if test="lastModifiedBy != null  and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
+			<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
+			<if test="activeFlag != null  and activeFlag != ''"> and active_flag = #{activeFlag}</if>
+			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="sapFactoryCode != null  and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
+			<if test="wlName != null  and wlName != ''"> and wl_name like concat('%', #{wlName}, '%')</if>
+			<if test="spareUseLife != null  and spareUseLife != ''"> and spare_use_life = #{spareUseLife}</if>
+			<if test="spareName != null  and spareName != ''"> and spare_name like concat('%', #{spareName}, '%')</if>
+			<if test="spareMode != null  and spareMode != ''"> and spare_mode like concat('%', #{spareMode}, '%')</if>
+			<if test="spareManufacturer != null  and spareManufacturer != ''"> and spare_manufacturer = #{spareManufacturer}</if>
+			<if test="spareSupplier != null  and spareSupplier != ''"> and spare_supplier = #{spareSupplier}</if>
+			<if test="spareReplacementCycle != null  and spareReplacementCycle != ''"> and spare_replacement_cycle = #{spareReplacementCycle}</if>
+			<if test="spareMeasurementUnit != null  and spareMeasurementUnit != ''"> and spare_measurement_unit = #{spareMeasurementUnit}</if>
+			<if test="spareConversionUnit != null  and spareConversionUnit != ''"> and spare_conversion_unit = #{spareConversionUnit}</if>
+			<if test="spareConversionRatio != null  and spareConversionRatio != ''"> and spare_conversion_ratio = #{spareConversionRatio}</if>
+			<if test="spareInventoryFloor != null  and spareInventoryFloor != ''"> and spare_inventory_floor = #{spareInventoryFloor}</if>
+			<if test="spareInventoryUpper != null  and spareInventoryUpper != ''"> and spare_inventory_upper = #{spareInventoryUpper}</if>
+			<if test="spareType != null  and spareType != ''"> and spare_type = #{spareType}</if>
+			and del_flag = '0'
+		</where>
+	</select>
+	
+	<select id="selectSparePartsLedgerByStorageId" parameterType="String" resultMap="SparePartsLedgerResult">
+		<include refid="selectSparePartsLedgerVo"/>
+		where storage_id = #{storageId}
+		and del_flag = '0'
+		and storage_tpye = 'SP'
+	</select>
+		
+	<insert id="insertSparePartsLedger" parameterType="SparePartsLedger">
+		insert into wms_ods_mate_storage_news
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="storageId != null and storageId != ''">storage_id,</if>
+			<if test="whCode != null">wh_code,</if>
+			<if test="regionCode != null">region_code,</if>
+			<if test="waCode != null">wa_code,</if>
+			<if test="storageType != null">storage_type,</if>
+			<if test="wlCode != null">wl_code,</if>
+			<if test="materialCode != null">material_code,</if>
+			<if test="materialDesc != null">material_desc,</if>
+			<if test="amount != null">amount,</if>
+			<if test="storageAmount != null">storage_amount,</if>
+			<if test="occupyAmount != null">occupy_amount,</if>
+			<if test="lpn != null">lpn,</if>
+			<if test="productBatch != null">product_batch,</if>
+			<if test="receiveDate != null">receive_date,</if>
+			<if test="productDate != null">product_date,</if>
+			<if test="userDefined1 != null">user_defined1,</if>
+			<if test="userDefined2 != null">user_defined2,</if>
+			<if test="userDefined3 != null">user_defined3,</if>
+			<if test="userDefined4 != null">user_defined4,</if>
+			<if test="userDefined5 != null">user_defined5,</if>
+			<if test="userDefined6 != null">user_defined6,</if>
+			<if test="userDefined7 != null">user_defined7,</if>
+			<if test="userDefined8 != null">user_defined8,</if>
+			<if test="userDefined9 != null">user_defined9,</if>
+			<if test="userDefined10 != null">user_defined10,</if>
+			<if test="createBy != null">create_by,</if>
+			<if test="gmtCreate != null">gmt_create,</if>
+			<if test="lastModifiedBy != null">last_modified_by,</if>
+			<if test="gmtModified != null">gmt_modified,</if>
+			<if test="activeFlag != null">active_flag,</if>
+			<if test="factoryCode != null">factory_code,</if>
+			<if test="sapFactoryCode != null">sap_factory_code,</if>
+			<if test="wlName != null">wl_name,</if>
+			<if test="delFlag != null">del_flag,</if>
+			<if test="spareUseLife != null">spare_use_life,</if>
+			<if test="spareName != null">spare_name,</if>
+			<if test="spareMode != null">spare_mode,</if>
+			<if test="spareManufacturer != null">spare_manufacturer,</if>
+			<if test="spareSupplier != null">spare_supplier,</if>
+			<if test="spareReplacementCycle != null">spare_replacement_cycle,</if>
+			<if test="spareMeasurementUnit != null">spare_measurement_unit,</if>
+			<if test="spareConversionUnit != null">spare_conversion_unit,</if>
+			<if test="spareConversionRatio != null">spare_conversion_ratio,</if>
+			<if test="spareInventoryFloor != null">spare_inventory_floor,</if>
+			<if test="spareInventoryUpper != null">spare_inventory_upper,</if>
+			<if test="spareType != null">spare_type,</if>
+		 </trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="storageId != null and storageId != ''">#{storageId},</if>
+			<if test="whCode != null">#{whCode},</if>
+			<if test="regionCode != null">#{regionCode},</if>
+			<if test="waCode != null">#{waCode},</if>
+			<if test="storageType != null">#{storageType},</if>
+			<if test="wlCode != null">#{wlCode},</if>
+			<if test="materialCode != null">#{materialCode},</if>
+			<if test="materialDesc != null">#{materialDesc},</if>
+			<if test="amount != null">#{amount},</if>
+			<if test="storageAmount != null">#{storageAmount},</if>
+			<if test="occupyAmount != null">#{occupyAmount},</if>
+			<if test="lpn != null">#{lpn},</if>
+			<if test="productBatch != null">#{productBatch},</if>
+			<if test="receiveDate != null">#{receiveDate},</if>
+			<if test="productDate != null">#{productDate},</if>
+			<if test="userDefined1 != null">#{userDefined1},</if>
+			<if test="userDefined2 != null">#{userDefined2},</if>
+			<if test="userDefined3 != null">#{userDefined3},</if>
+			<if test="userDefined4 != null">#{userDefined4},</if>
+			<if test="userDefined5 != null">#{userDefined5},</if>
+			<if test="userDefined6 != null">#{userDefined6},</if>
+			<if test="userDefined7 != null">#{userDefined7},</if>
+			<if test="userDefined8 != null">#{userDefined8},</if>
+			<if test="userDefined9 != null">#{userDefined9},</if>
+			<if test="userDefined10 != null">#{userDefined10},</if>
+			<if test="createBy != null">#{createBy},</if>
+			<if test="gmtCreate != null">#{gmtCreate},</if>
+			<if test="lastModifiedBy != null">#{lastModifiedBy},</if>
+			<if test="gmtModified != null">#{gmtModified},</if>
+			<if test="activeFlag != null">#{activeFlag},</if>
+			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
+			<if test="wlName != null">#{wlName},</if>
+			<if test="delFlag != null">#{delFlag},</if>
+			<if test="spareUseLife != null">#{spareUseLife},</if>
+			<if test="spareName != null">#{spareName},</if>
+			<if test="spareMode != null">#{spareMode},</if>
+			<if test="spareManufacturer != null">#{spareManufacturer},</if>
+			<if test="spareSupplier != null">#{spareSupplier},</if>
+			<if test="spareReplacementCycle != null">#{spareReplacementCycle},</if>
+			<if test="spareMeasurementUnit != null">#{spareMeasurementUnit},</if>
+			<if test="spareConversionUnit != null">#{spareConversionUnit},</if>
+			<if test="spareConversionRatio != null">#{spareConversionRatio},</if>
+			<if test="spareInventoryFloor != null">#{spareInventoryFloor},</if>
+			<if test="spareInventoryUpper != null">#{spareInventoryUpper},</if>
+			<if test="spareType != null">#{spareType},</if>
+		 </trim>
+	</insert>
+
+	<update id="updateSparePartsLedger" parameterType="SparePartsLedger">
+		update wms_ods_mate_storage_news
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="whCode != null">wh_code = #{whCode},</if>
+			<if test="regionCode != null">region_code = #{regionCode},</if>
+			<if test="waCode != null">wa_code = #{waCode},</if>
+			<if test="storageType != null">storage_type = #{storageType},</if>
+			<if test="wlCode != null">wl_code = #{wlCode},</if>
+			<if test="materialCode != null">material_code = #{materialCode},</if>
+			<if test="materialDesc != null">material_desc = #{materialDesc},</if>
+			<if test="amount != null">amount = #{amount},</if>
+			<if test="storageAmount != null">storage_amount = #{storageAmount},</if>
+			<if test="occupyAmount != null">occupy_amount = #{occupyAmount},</if>
+			<if test="lpn != null">lpn = #{lpn},</if>
+			<if test="productBatch != null">product_batch = #{productBatch},</if>
+			<if test="receiveDate != null">receive_date = #{receiveDate},</if>
+			<if test="productDate != null">product_date = #{productDate},</if>
+			<if test="userDefined1 != null">user_defined1 = #{userDefined1},</if>
+			<if test="userDefined2 != null">user_defined2 = #{userDefined2},</if>
+			<if test="userDefined3 != null">user_defined3 = #{userDefined3},</if>
+			<if test="userDefined4 != null">user_defined4 = #{userDefined4},</if>
+			<if test="userDefined5 != null">user_defined5 = #{userDefined5},</if>
+			<if test="userDefined6 != null">user_defined6 = #{userDefined6},</if>
+			<if test="userDefined7 != null">user_defined7 = #{userDefined7},</if>
+			<if test="userDefined8 != null">user_defined8 = #{userDefined8},</if>
+			<if test="userDefined9 != null">user_defined9 = #{userDefined9},</if>
+			<if test="userDefined10 != null">user_defined10 = #{userDefined10},</if>
+			<if test="createBy != null">create_by = #{createBy},</if>
+			<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
+			<if test="lastModifiedBy != null">last_modified_by = #{lastModifiedBy},</if>
+			<if test="gmtModified != null">gmt_modified = #{gmtModified},</if>
+			<if test="activeFlag != null">active_flag = #{activeFlag},</if>
+			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
+			<if test="wlName != null">wl_name = #{wlName},</if>
+			<if test="delFlag != null">del_flag = #{delFlag},</if>
+			<if test="spareUseLife != null">spare_use_life = #{spareUseLife},</if>
+			<if test="spareName != null">spare_name = #{spareName},</if>
+			<if test="spareMode != null">spare_mode = #{spareMode},</if>
+			<if test="spareManufacturer != null">spare_manufacturer = #{spareManufacturer},</if>
+			<if test="spareSupplier != null">spare_supplier = #{spareSupplier},</if>
+			<if test="spareReplacementCycle != null">spare_replacement_cycle = #{spareReplacementCycle},</if>
+			<if test="spareMeasurementUnit != null">spare_measurement_unit = #{spareMeasurementUnit},</if>
+			<if test="spareConversionUnit != null">spare_conversion_unit = #{spareConversionUnit},</if>
+			<if test="spareConversionRatio != null">spare_conversion_ratio = #{spareConversionRatio},</if>
+			<if test="spareInventoryFloor != null">spare_inventory_floor = #{spareInventoryFloor},</if>
+			<if test="spareInventoryUpper != null">spare_inventory_upper = #{spareInventoryUpper},</if>
+			<if test="spareType != null">spare_type = #{spareType},</if>
+		</trim>
+		where storage_id = #{storageId}
+	</update>
+
+	<delete id="deleteSparePartsLedgerByStorageId" parameterType="String">
+		delete from wms_ods_mate_storage_news where storage_id = #{storageId}
+	</delete>
+
+	<delete id="deleteSparePartsLedgerByStorageIds" parameterType="String">
+		delete from wms_ods_mate_storage_news where storage_id in 
+		<foreach item="storageId" collection="array" open="(" separator="," close=")">
+			#{storageId}
+		</foreach>
+	</delete>
+</mapper>

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -4,18 +4,19 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-
+import com.op.common.core.domain.ExcelCol;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.poi.ExcelMapUtil;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.mes.domain.*;
 import com.op.mes.domain.dto.LineChartDto;
 import com.op.mes.domain.dto.SysFactoryDto;
-import com.op.mes.mapper.MesReportWorkMapper;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -196,7 +197,7 @@ public class MesReportWorkController extends BaseController {
 	 */
 	@RequiresPermissions("mes:hourProduction:list")
 	@GetMapping("/getHourProductionTitle")
-	public List<String> getProcessFinishList(MesHourReport mesHourReport) {
+	public List<String> getHourProductionTitle(MesHourReport mesHourReport) {
 		//默认时间范围T 00:00:00~T+1 00:00:00
         if(StringUtils.isEmpty(mesHourReport.getProductDateStart())){
 			mesHourReport.setProductDateStart(DateUtils.getDate()+" 00:00:00");//start
@@ -210,8 +211,20 @@ public class MesReportWorkController extends BaseController {
 		List<String> dayHours = new ArrayList<String>();
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH");
 		try {
-			Date start = dateFormat.parse(mesHourReport.getProductDateStart());
-			Date end = dateFormat.parse(mesHourReport.getProductDateEnd());
+
+			Date start = dateFormat.parse(mesHourReport.getProductDateStart());//开始
+			Date end = dateFormat.parse(mesHourReport.getProductDateEnd());//结束
+
+            //如果有分钟数，默认加一小时
+			String endTimeStr1 = mesHourReport.getProductDateEnd();
+			String[] endTime2 = endTimeStr1.split(" ");
+			String endTime3 = endTime2[1].split(":")[1];
+			if(Integer.parseInt(endTime3)!=0){
+				Calendar calendar = Calendar.getInstance();
+				calendar.setTime(end);
+				calendar.add(Calendar.HOUR_OF_DAY, 1);
+				end = calendar.getTime();
+			}
 
 			Calendar tempStart = Calendar.getInstance();
 			tempStart.setTime(start);
@@ -228,18 +241,68 @@ public class MesReportWorkController extends BaseController {
 
 		return dayHours;
 	}
+
+	/**
+	 * 获取班次信息list
+	 *
+	 * @return
+	 */
+	@GetMapping("/getProShifts")
+	public AjaxResult getProShifts() {
+		return success(mesReportWorkService.getProShifts());
+	}
+
 	/**
 	 * 小时产量数据体
 	 */
 	@RequiresPermissions("mes:hourProduction:list")
 	@GetMapping("/getHourProductionList")
 	public List<HashMap> getHourProductionList(MesHourReport mesHourReport) {
-		List<String> hourNames = this.getProcessFinishList(mesHourReport);
+		List<String> hourNames = this.getHourProductionTitle(mesHourReport);
 		mesHourReport.setHourNames(hourNames);
 		List<HashMap> list = mesReportWorkService.getHourProductionList(mesHourReport);
 		return list;
 	}
 
+	@RequiresPermissions("mes:hourProduction:list")
+	@PostMapping("/getHourProductionExport")
+	public void getHourProductionExport(HttpServletResponse response,MesHourReport mesHourReport) {
+		List<String> hourNames = this.getHourProductionTitle(mesHourReport);
+		mesHourReport.setHourNames(hourNames);
+		List<HashMap> list = mesReportWorkService.getHourProductionList(mesHourReport);
+
+		//表格结构数据
+		String title = "表主标题";
+		ArrayList<ExcelCol> excelCols = new ArrayList<>();
+		excelCols.add(new ExcelCol("设备编码","equCode",20));
+		excelCols.add(new ExcelCol("设备名称","equName",20));
+		excelCols.add(new ExcelCol("设备总产量","quantity",20));
+
+		for(int n = 0;n<hourNames.size();n++){
+			String hourName = hourNames.get(n);
+			excelCols.add(new ExcelCol(hourName,"hourPro"+n,20));
+		}
+
+		String titleName = "设备小时产量报表";
+		SXSSFWorkbook workbook = null;
+		try {
+			//设置响应头
+			response.setHeader("Content-disposition",
+					"attachment; filename="+ titleName);
+			response.setContentType("application/octet-stream;charset=UTF-8");
+			ServletOutputStream outputStream = response.getOutputStream();
+			//调用工具类
+			workbook = ExcelMapUtil.initWorkbook(titleName, titleName, excelCols, list);
+			workbook.write(outputStream);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			if (workbook!=null){
+				workbook.dispose();
+			}
+		}
+	}
+
 
 	public static void main(String args[]){
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");

op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java

@@ -57,7 +57,7 @@ public class WCSInterfaceController extends BaseController {
         return success(WCInterfaceService.requestDestinationStations(wcsdto));
     }
 
-    @Log(title = "获取料罐用量", businessType = BusinessType.GRANT)
+    @Log(title = "获取料罐用量(废弃，留着以后给别的功能用)", businessType = BusinessType.GRANT)
     @PostMapping("/saveLGusedLog")
     public AjaxResult saveLGusedLog(@RequestBody List<LGInfoDto> lgdtos) {
         if(CollectionUtils.isEmpty(lgdtos)){

op-modules/op-mes/src/main/java/com/op/mes/domain/MesHourReport.java

@@ -28,6 +28,15 @@ public class MesHourReport extends BaseEntity {
 	private String workorderCode;
 	private List<String> hourNames;
     private String equCodeHour;
+    private String shiftId;
+
+	public String getShiftId() {
+		return shiftId;
+	}
+
+	public void setShiftId(String shiftId) {
+		this.shiftId = shiftId;
+	}
 
 	public String getEquCodeHour() {
 		return equCodeHour;

op-modules/op-mes/src/main/java/com/op/mes/domain/MesProcessReport.java

@@ -46,6 +46,15 @@ public class MesProcessReport extends BaseEntity {
 	private String unit;
 	private String productDateStart;
 	private String productDateEnd;
+    private String shiftId;
+
+	public String getShiftId() {
+		return shiftId;
+	}
+
+	public void setShiftId(String shiftId) {
+		this.shiftId = shiftId;
+	}
 
 	public String getEquCode() {
 		return equCode;

op-modules/op-mes/src/main/java/com/op/mes/domain/MesShift.java

@@ -0,0 +1,39 @@
+package com.op.mes.domain;
+
+//班次实体类
+public class MesShift {
+    private Integer shiftId;
+    private String shiftDesc;
+
+    @Override
+    public String toString() {
+        return "ProShift{" +
+                "shiftId=" + shiftId +
+                ", shiftDesc='" + shiftDesc + '\'' +
+                '}';
+    }
+
+    public Integer getShiftId() {
+        return shiftId;
+    }
+
+    public void setShiftId(Integer shiftId) {
+        this.shiftId = shiftId;
+    }
+
+    public String getShiftDesc() {
+        return shiftDesc;
+    }
+
+    public void setShiftDesc(String shiftDesc) {
+        this.shiftDesc = shiftDesc;
+    }
+
+    public MesShift(Integer shiftId, String shiftDesc) {
+        this.shiftId = shiftId;
+        this.shiftDesc = shiftDesc;
+    }
+
+    public MesShift() {
+    }
+}

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -85,4 +85,6 @@ public interface MesReportWorkMapper {
     Map<String,MesHourReport> getHourProductionList(MesHourReport mesHourReport);
 
 	List<MesHourReport> getEquNames(MesHourReport mesHourReport);
+
+    List<MesShift> selectProShift();
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java

@@ -75,4 +75,6 @@ public interface IMesReportWorkService {
     LineChartDto getLineChartData(MesReportProduction mesReportProduction);
 
 	List<HashMap> getHourProductionList(MesHourReport mesHourReport);
+
+	List<MesShift> getProShifts();
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -150,7 +150,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         List<BoardDTO> totals = null;
         List<BoardDTO> everys = null;
         if("equ_type_lg".equals(boardDTO.getEquTypeCode())){//equ_type_lg 湿料罐
-            boardDTO.setYmd(boardDTO.getYmd().replace("-",""));
+
             totals = mesMapper.getTotalNumL(boardDTO);
             everys = mesMapper.getEveryNumL(boardDTO);
         }else{//成型机、烘房、收坯机
@@ -158,7 +158,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             everys = mesMapper.getEveryNum(boardDTO);
         }
 
-
         boardMap.put("totalNum", totals);
         boardMap.put("everyNum", everys);
         return boardMap;

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -289,6 +289,16 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		return days;
 	}
 
+	/**
+	 * 获取班次信息list
+	 * @return
+	 */
+	@Override
+	@DS("#header.poolName")
+	public List<MesShift> getProShifts() {
+		return mesReportWorkMapper.selectProShift();
+	}
+
 	public static void main(String[] args) {
 		Calendar calendar = Calendar.getInstance();
 		Date now = calendar.getTime();

op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml

@@ -116,23 +116,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(0) totalNum,
                equ.equipment_type_code equTypeCode,
                equ.equipment_type_name equTypeName
-        from pro_lg_used_log mt
-        left join base_equipment equ on mt.device_code = equ.equipment_code
-        where mt.createDate = #{ymd} and equ.equipment_name is not null
-          and equ.equipment_type_code = #{equTypeCode}
+        from mes_material_transfer_result mt
+        left join base_equipment equ on mt.equipmentCode = equ.equipment_code
+        where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null
+          and equ.equipment_type_code = #{equTypeCode} and mt.status = 2
         group by equ.equipment_type_code,
                  equ.equipment_type_name
     </select>
     <select id="getEveryNumL" resultType="com.op.system.api.domain.dto.BoardDTO">
         select count(0) totalNum,
-               mt.device_code equCode,
+               mt.equipmentCode equCode,
                equ.equipment_name equName,
                equ.equipment_type_code equTypeCode
-        from pro_lg_used_log mt
-        left join base_equipment equ on mt.device_code = equ.equipment_code
-        where mt.createDate = #{ymd} and equ.equipment_name is not null
-          and equ.equipment_type_code = #{equTypeCode}
-        group by mt.device_code,
+        from mes_material_transfer_result mt
+        left join base_equipment equ on mt.equipmentCode = equ.equipment_code
+        where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null
+          and equ.equipment_type_code = #{equTypeCode} and mt.status = 2
+        group by mt.equipmentCode,
                  equ.equipment_name,
                  equ.equipment_type_code
     </select>

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join pro_order_workorder pow on pow.workorder_id = mt.OrderCode
 		left join pro_process ps on ps.process_id = mt.now_process_id
 		where pow.order_code is not null
+		<if test="shiftId != null  and shiftId != ''">
+			and pow.shift_id = #{shiftId}
+		</if>
 		<if test="orderCode != null  and orderCode != ''">
 			and pow.order_code like concat('%', #{orderCode}, '%')
 		</if>
@@ -255,6 +258,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where 1=1
 		<if test="productDateStart != null "> and CONVERT(varchar(30),mt.update_time, 120) >= #{productDateStart}</if>
 		<if test="productDateEnd != null "> and #{productDateEnd} > CONVERT(varchar(30),mt.update_time, 120)</if>
+		<if test="shiftId != null  and shiftId != ''">
+			and pow.shift_id = #{shiftId}
+		</if>
 		<if test="orderCode != null  and orderCode != ''">
 			and pow.order_code like concat('%', #{orderCode}, '%')
 		</if>
@@ -297,7 +303,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join base_equipment equ on mt.equipmentCode = equ.equipment_code
 		left join pro_order_workorder pow on pow.workorder_id = mt.OrderCode
 		where pow.order_code is not null
-
+		<if test="shiftId != null  and shiftId != ''">
+			and pow.shift_id = #{shiftId}
+		</if>
 		<if test="orderCode != null  and orderCode != ''">
 			and pow.order_code like concat('%', #{orderCode}, '%')
 		</if>
@@ -318,6 +326,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mt.equipmentCode,
 			equ.equipment_name
 	</select>
+	<select id="selectProShift" resultType="com.op.mes.domain.MesShift">
+		SELECT bst.Shift_Id shiftId,bst.Shift_Desc shiftDesc
+		FROM base_shifts_t bst
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-sap/push-sap.bat

@@ -27,7 +27,8 @@ if exist %df% (
 	del /f /s /q .\Dockerfile
 )
 echo --------------------------------´´½¨Dockerfile--------------------------------
-echo FROM 192.168.202.36:30002/library/openjdk:8u131-jdk-alpine >> Dockerfile
+echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
+::echo RUN apk add libuuid libuuid-devel >> Dockerfile
 echo ADD libsapjco3.so /usr/lib/libsapjco3.so >> Dockerfile
 echo ADD sapjco3.jar /usr/lib/sapjco3.jar >> Dockerfile
 echo RUN chmod a+x -R /usr/lib/libsapjco3.so >> Dockerfile
@@ -37,7 +38,7 @@ echo RUN echo "Asia/Shanghai" ^> /etc/timezone >> Dockerfile
 echo CMD ["java", "-jar", "-Dspring.profiles.active=%profile%", "application.jar"] >> Dockerfile
 dir
 echo --------------------------------docker login...-------------------------------
-docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
+docker login 192.168.202.36:30002 -u admin -p Harbor@2023
 echo --------------------------------docker build...-------------------------------
 docker build -t %imageURI%:%imageVersion% .
 echo --------------------------------docker push...--------------------------------