Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsWhiteEmbryoInController.java

@@ -68,7 +68,7 @@ public class WmsOdsWhiteEmbryoInController extends BaseController {
 	/**
 	 * 新增白胚入库单
 	 */
-	@PostMapping("/add")
+	@PostMapping
 	public AjaxResult add(@RequestBody List<WmsOdsWhiteEmbryoIn> wmsOdsWhiteEmbryoIns) {
 		return toAjax(wmsOdsWhiteEmbryoInService.insertWmsOdsWhiteEmbryoIn(wmsOdsWhiteEmbryoIns));
 	}

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java

@@ -0,0 +1,97 @@
+package com.op.wms.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.wms.domain.WmsRawOrderIn;
+import com.op.wms.service.IWmsRawOrderInService;
+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-08-30
+ */
+@RestController
+@RequestMapping("/odsRawOrderIn")
+public class WmsRawOrderInController extends BaseController {
+	@Autowired
+	private IWmsRawOrderInService wmsRawOrderInService;
+
+	/**
+	 * 查询包材到货单列表
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:list")
+	@GetMapping("/list")
+	public TableDataInfo list(WmsRawOrderIn wmsRawOrderIn) {
+		startPage();
+		List<WmsRawOrderIn> list = wmsRawOrderInService.selectWmsRawOrderInList(wmsRawOrderIn);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 导出包材到货单列表
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:export")
+	@Log(title = "包材到货单", businessType = BusinessType.EXPORT)
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, WmsRawOrderIn wmsRawOrderIn) {
+		List<WmsRawOrderIn> list = wmsRawOrderInService.selectWmsRawOrderInList(wmsRawOrderIn);
+		ExcelUtil<WmsRawOrderIn> util = new ExcelUtil<WmsRawOrderIn>(WmsRawOrderIn.class);
+		util.exportExcel(response, list, "包材到货单数据");
+	}
+
+	/**
+	 * 获取包材到货单详细信息
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:query")
+	@GetMapping(value = "/{rawOrderInId}")
+	public AjaxResult getInfo(@PathVariable("rawOrderInId") String rawOrderInId) {
+		return success(wmsRawOrderInService.selectWmsRawOrderInByRawOrderInId(rawOrderInId));
+	}
+
+	/**
+	 * 新增包材到货单
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:add")
+	@Log(title = "包材到货单", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody WmsRawOrderIn wmsRawOrderIn) {
+		return toAjax(wmsRawOrderInService.insertWmsRawOrderIn(wmsRawOrderIn));
+	}
+
+	/**
+	 * 修改包材到货单
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:edit")
+	@Log(title = "包材到货单", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody WmsRawOrderIn wmsRawOrderIn) {
+		return toAjax(wmsRawOrderInService.updateWmsRawOrderIn(wmsRawOrderIn));
+	}
+
+	/**
+	 * 删除包材到货单
+	 */
+	@RequiresPermissions("wms:odsRawOrderIn:remove")
+	@Log(title = "包材到货单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rawOrderInIds}")
+	public AjaxResult remove(@PathVariable String[] rawOrderInIds) {
+		return toAjax(wmsRawOrderInService.deleteWmsRawOrderInByRawOrderInIds(rawOrderInIds));
+	}
+}

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInSnController.java

@@ -0,0 +1,97 @@
+package com.op.wms.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.wms.domain.WmsRawOrderInSn;
+import com.op.wms.service.IWmsRawOrderInSnService;
+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-08-30
+ */
+@RestController
+@RequestMapping("/wmsRawOrderInSn")
+public class WmsRawOrderInSnController extends BaseController {
+	@Autowired
+	private IWmsRawOrderInSnService wmsRawOrderInSnService;
+
+	/**
+	 * 查询原材料收货明细列表
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:list")
+	@GetMapping("/list")
+	public TableDataInfo list(WmsRawOrderInSn wmsRawOrderInSn) {
+		startPage();
+		List<WmsRawOrderInSn> list = wmsRawOrderInSnService.selectWmsRawOrderInSnList(wmsRawOrderInSn);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 导出原材料收货明细列表
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:export")
+	@Log(title = "原材料收货明细", businessType = BusinessType.EXPORT)
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, WmsRawOrderInSn wmsRawOrderInSn) {
+		List<WmsRawOrderInSn> list = wmsRawOrderInSnService.selectWmsRawOrderInSnList(wmsRawOrderInSn);
+		ExcelUtil<WmsRawOrderInSn> util = new ExcelUtil<WmsRawOrderInSn>(WmsRawOrderInSn.class);
+		util.exportExcel(response, list, "原材料收货明细数据");
+	}
+
+	/**
+	 * 获取原材料收货明细详细信息
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:query")
+	@GetMapping(value = "/{rawOrderInSnId}")
+	public AjaxResult getInfo(@PathVariable("rawOrderInSnId") Long rawOrderInSnId) {
+		return success(wmsRawOrderInSnService.selectWmsRawOrderInSnByRawOrderInSnId(rawOrderInSnId));
+	}
+
+	/**
+	 * 新增原材料收货明细
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:add")
+	@Log(title = "原材料收货明细", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody WmsRawOrderInSn wmsRawOrderInSn) {
+		return toAjax(wmsRawOrderInSnService.insertWmsRawOrderInSn(wmsRawOrderInSn));
+	}
+
+	/**
+	 * 修改原材料收货明细
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:edit")
+	@Log(title = "原材料收货明细", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody WmsRawOrderInSn wmsRawOrderInSn) {
+		return toAjax(wmsRawOrderInSnService.updateWmsRawOrderInSn(wmsRawOrderInSn));
+	}
+
+	/**
+	 * 删除原材料收货明细
+	 */
+	@RequiresPermissions("wms:wmsRawOrderInSn:remove")
+	@Log(title = "原材料收货明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{rawOrderInSnIds}")
+	public AjaxResult remove(@PathVariable Long[] rawOrderInSnIds) {
+		return toAjax(wmsRawOrderInSnService.deleteWmsRawOrderInSnByRawOrderInSnIds(rawOrderInSnIds));
+	}
+}

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java

@@ -78,8 +78,8 @@ public class BaseEquipment extends BaseEntity {
 	private Long attr4;
 
 	/** 单台能力工时 */
-//	@Excel(name = "单台能力工时")
+	@Excel(name = "单台能力工时")
-//	private String unitWorkingHours;
+	private String unitWorkingHours;
 
 	/** 工段 */
 	@Excel(name = "工段")
@@ -205,13 +205,13 @@ public class BaseEquipment extends BaseEntity {
 	public Long getAttr4() {
 		return attr4;
 	}
-//	public void setUnitWorkingHours(String unitWorkingHours) {
+	public void setUnitWorkingHours(String unitWorkingHours) {
-//		this.unitWorkingHours = unitWorkingHours;
+		this.unitWorkingHours = unitWorkingHours;
-//	}
+	}
-//
+
-//	public String getUnitWorkingHours() {
+	public String getUnitWorkingHours() {
-//		return unitWorkingHours;
+		return unitWorkingHours;
-//	}
+	}
 	public void setWorkshopSection(String workshopSection) {
 		this.workshopSection = workshopSection;
 	}
@@ -237,31 +237,31 @@ public class BaseEquipment extends BaseEntity {
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-			.append("equipmentId", getEquipmentId())
+				.append("equipmentId", getEquipmentId())
-			.append("equipmentCode", getEquipmentCode())
+				.append("equipmentCode", getEquipmentCode())
-			.append("equipmentName", getEquipmentName())
+				.append("equipmentName", getEquipmentName())
-			.append("equipmentBrand", getEquipmentBrand())
+				.append("equipmentBrand", getEquipmentBrand())
-			.append("equipmentSpec", getEquipmentSpec())
+				.append("equipmentSpec", getEquipmentSpec())
-			.append("equipmentTypeId", getEquipmentTypeId())
+				.append("equipmentTypeId", getEquipmentTypeId())
-			.append("equipmentTypeCode", getEquipmentTypeCode())
+				.append("equipmentTypeCode", getEquipmentTypeCode())
-			.append("equipmentTypeName", getEquipmentTypeName())
+				.append("equipmentTypeName", getEquipmentTypeName())
-			.append("workshopId", getWorkshopId())
+				.append("workshopId", getWorkshopId())
-			.append("workshopCode", getWorkshopCode())
+				.append("workshopCode", getWorkshopCode())
-			.append("workshopName", getWorkshopName())
+				.append("workshopName", getWorkshopName())
-			.append("status", getStatus())
+				.append("status", getStatus())
-			.append("remark", getRemark())
+				.append("remark", getRemark())
-			.append("attr1", getAttr1())
+				.append("attr1", getAttr1())
-			.append("attr2", getAttr2())
+				.append("attr2", getAttr2())
-			.append("attr3", getAttr3())
+				.append("attr3", getAttr3())
-			.append("attr4", getAttr4())
+				.append("attr4", getAttr4())
-			.append("createBy", getCreateBy())
+				.append("createBy", getCreateBy())
-			.append("createTime", getCreateTime())
+				.append("createTime", getCreateTime())
-			.append("updateBy", getUpdateBy())
+				.append("updateBy", getUpdateBy())
-			.append("updateTime", getUpdateTime())
+				.append("updateTime", getUpdateTime())
-//			.append("unitWorkingHours", getUnitWorkingHours())
+				.append("unitWorkingHours", getUnitWorkingHours())
-			.append("workshopSection", getWorkshopSection())
+				.append("workshopSection", getWorkshopSection())
-			.append("equipmentLocation", getEquipmentLocation())
+				.append("equipmentLocation", getEquipmentLocation())
-			.append("hourlyUnitPrice", getHourlyUnitPrice())
+				.append("hourlyUnitPrice", getHourlyUnitPrice())
-			.toString();
+				.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java

@@ -81,6 +81,10 @@ public class BaseTeamT extends BaseEntity {
 	@Excel(name = "班组长编码")
 	private String teamLeaderCode;
 
+	/** 班组长编码 */
+	@Excel(name = "班组长编码")
+	private String teamLeaderName;
+
 	/** 定编岗位数量 */
 	@Excel(name = "定编岗位数量")
 	private Integer planPostQuantity;
@@ -229,6 +233,15 @@ public class BaseTeamT extends BaseEntity {
 	public String getTeamLeaderCode() {
 		return teamLeaderCode;
 	}
+
+	public void setTeamLeaderName(String teamLeaderName) {
+		this.teamLeaderName = teamLeaderName;
+	}
+
+	public String getTeamLeaderName() {
+		return teamLeaderName;
+	}
+
 	public void setPlanPostQuantity(Integer planPostQuantity) {
 		this.planPostQuantity = planPostQuantity;
 	}
@@ -292,6 +305,7 @@ public class BaseTeamT extends BaseEntity {
 			.append("siteCode", getSiteCode())
 			.append("productionLineCode", getProductionLineCode())
 			.append("teamLeaderCode", getTeamLeaderCode())
+			.append("teamLeaderName", getTeamLeaderName())
 			.append("planPostQuantity", getPlanPostQuantity())
 			.append("actualPostQuantity", getActualPostQuantity())
 			.append("salaryType", getSalaryType())

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java

@@ -0,0 +1,655 @@
+package com.op.wms.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
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+public class WmsRawOrderIn extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** 唯一序列号 */
+	private String rawOrderInId;
+
+	/** 工厂编码 */
+	@Excel(name = "工厂编码")
+	private String factoryCode;
+
+	/** 仓库编码 */
+	@Excel(name = "仓库编码")
+	private String whCode;
+
+	/** 库区编码 */
+	@Excel(name = "库区编码")
+	private String waCode;
+
+	/** 库位编码 */
+	@Excel(name = "库位编码")
+	private String wlCode;
+
+	/** 入库单类型 */
+	@Excel(name = "入库单类型")
+	private String orderInType;
+
+	/** 入库单号 */
+	@Excel(name = "入库单号")
+	private String orderNo;
+
+	/** DN单号 */
+	@Excel(name = "DN单号")
+	private String dnNo;
+
+	/** 采购订单号 */
+	@Excel(name = "采购订单号")
+	private String poNo;
+
+	/** 采购订单行号 */
+	@Excel(name = "采购订单行号")
+	private String poLine;
+
+	/** 采购订单类型 */
+	@Excel(name = "采购订单类型")
+	private String poType;
+
+	/** 物料号 */
+	@Excel(name = "物料号")
+	private String materialCode;
+
+	/** 物料描述 */
+	@Excel(name = "物料描述")
+	private String materialDesc;
+
+	/** 单位 */
+	@Excel(name = "单位")
+	private String unit;
+
+	/** 采购组 */
+	@Excel(name = "采购组")
+	private String buyerGroup;
+
+	/** 供应商编码 */
+	@Excel(name = "供应商编码")
+	private String supplyCode;
+
+	/** 工厂 */
+	@Excel(name = "工厂")
+	private String sapFactoryCode;
+
+	/** 交货地点 */
+	@Excel(name = "交货地点")
+	private String sendSpot;
+
+	/** 需求数量 */
+	@Excel(name = "需求数量")
+	private BigDecimal requestAmount;
+
+	/** 收货数量 */
+	@Excel(name = "收货数量")
+	private BigDecimal receiptAmount;
+
+	/** 备品数量 */
+	@Excel(name = "备品数量")
+	private BigDecimal shelvesAmount;
+
+	/** 库存地点 */
+	@Excel(name = "库存地点")
+	private String location;
+
+	/** 需求时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "需求时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date requestTime;
+
+	/** 质检状态，默认0待检,1合格，2不合格，3免检, */
+	@Excel(name = "质检状态，默认0待检,1合格，2不合格，3免检,")
+	private String qualityStatus;
+
+	/** 0创建1拒收2收货完成3上架完成4入库完成 */
+	@Excel(name = "0创建1拒收2收货完成3上架完成4入库完成")
+	private String orderStatus;
+
+	/** 收货操作人 */
+	@Excel(name = "收货操作人")
+	private String receiptOperator;
+
+	/** 收货时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "收货时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date receiptTime;
+
+	/** 上架操作人 */
+	@Excel(name = "上架操作人")
+	private String shelvesOperator;
+
+	/** 退货数量 */
+	@Excel(name = "退货数量")
+	private BigDecimal returnAmount;
+
+	/** 退料人 */
+	@Excel(name = "退料人")
+	private String returnName;
+
+	/** 退货过账时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "退货过账时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date returnTime;
+
+	/** 冲销过账:
+0未退货；
+1用户拒绝；
+2退货完成；
+3SAP正在处理；
+4SAP拒绝 */
+	@Excel(name = "冲销过账: 0未退货； 1用户拒绝； 2退货完成； 3SAP正在处理； 4SAP拒绝")
+	private String returnStatus;
+
+	/** 上架时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "上架时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date shelvesTime;
+
+	/** 退货过账信息 */
+	@Excel(name = "退货过账信息")
+	private String returnMessage;
+
+	/** 收货过账状态:
+0未收货；
+1用户拒绝；
+2收货完成；
+3SAP正在处理；
+4SAP拒绝 */
+	@Excel(name = "收货过账状态: 0未收货； 1用户拒绝； 2收货完成； 3SAP正在处理； 4SAP拒绝")
+	private String accountingStatus;
+
+	/** 收货过账时间 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "收货过账时间", width = 30, dateFormat = "yyyy-MM-dd")
+	private Date accountingTime;
+
+	/** 收货过账信息 */
+	@Excel(name = "收货过账信息")
+	private String accountingMessage;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined1;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined2;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined3;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined4;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined5;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined6;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	private String userDefined7;
+
+	/** 备用 */
+	@Excel(name = "备用")
+	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;
+
+	public void setRawOrderInId(String rawOrderInId) {
+		this.rawOrderInId = rawOrderInId;
+	}
+
+	public String getRawOrderInId() {
+		return rawOrderInId;
+	}
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+	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 setOrderInType(String orderInType) {
+		this.orderInType = orderInType;
+	}
+
+	public String getOrderInType() {
+		return orderInType;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setDnNo(String dnNo) {
+		this.dnNo = dnNo;
+	}
+
+	public String getDnNo() {
+		return dnNo;
+	}
+	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 setPoType(String poType) {
+		this.poType = poType;
+	}
+
+	public String getPoType() {
+		return poType;
+	}
+	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 setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+	public void setBuyerGroup(String buyerGroup) {
+		this.buyerGroup = buyerGroup;
+	}
+
+	public String getBuyerGroup() {
+		return buyerGroup;
+	}
+	public void setSupplyCode(String supplyCode) {
+		this.supplyCode = supplyCode;
+	}
+
+	public String getSupplyCode() {
+		return supplyCode;
+	}
+	public void setSapFactoryCode(String sapFactoryCode) {
+		this.sapFactoryCode = sapFactoryCode;
+	}
+
+	public String getSapFactoryCode() {
+		return sapFactoryCode;
+	}
+	public void setSendSpot(String sendSpot) {
+		this.sendSpot = sendSpot;
+	}
+
+	public String getSendSpot() {
+		return sendSpot;
+	}
+	public void setRequestAmount(BigDecimal requestAmount) {
+		this.requestAmount = requestAmount;
+	}
+
+	public BigDecimal getRequestAmount() {
+		return requestAmount;
+	}
+	public void setReceiptAmount(BigDecimal receiptAmount) {
+		this.receiptAmount = receiptAmount;
+	}
+
+	public BigDecimal getReceiptAmount() {
+		return receiptAmount;
+	}
+	public void setShelvesAmount(BigDecimal shelvesAmount) {
+		this.shelvesAmount = shelvesAmount;
+	}
+
+	public BigDecimal getShelvesAmount() {
+		return shelvesAmount;
+	}
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+	public void setRequestTime(Date requestTime) {
+		this.requestTime = requestTime;
+	}
+
+	public Date getRequestTime() {
+		return requestTime;
+	}
+	public void setQualityStatus(String qualityStatus) {
+		this.qualityStatus = qualityStatus;
+	}
+
+	public String getQualityStatus() {
+		return qualityStatus;
+	}
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+	public void setReceiptOperator(String receiptOperator) {
+		this.receiptOperator = receiptOperator;
+	}
+
+	public String getReceiptOperator() {
+		return receiptOperator;
+	}
+	public void setReceiptTime(Date receiptTime) {
+		this.receiptTime = receiptTime;
+	}
+
+	public Date getReceiptTime() {
+		return receiptTime;
+	}
+	public void setShelvesOperator(String shelvesOperator) {
+		this.shelvesOperator = shelvesOperator;
+	}
+
+	public String getShelvesOperator() {
+		return shelvesOperator;
+	}
+	public void setReturnAmount(BigDecimal returnAmount) {
+		this.returnAmount = returnAmount;
+	}
+
+	public BigDecimal getReturnAmount() {
+		return returnAmount;
+	}
+	public void setReturnName(String returnName) {
+		this.returnName = returnName;
+	}
+
+	public String getReturnName() {
+		return returnName;
+	}
+	public void setReturnTime(Date returnTime) {
+		this.returnTime = returnTime;
+	}
+
+	public Date getReturnTime() {
+		return returnTime;
+	}
+	public void setReturnStatus(String returnStatus) {
+		this.returnStatus = returnStatus;
+	}
+
+	public String getReturnStatus() {
+		return returnStatus;
+	}
+	public void setShelvesTime(Date shelvesTime) {
+		this.shelvesTime = shelvesTime;
+	}
+
+	public Date getShelvesTime() {
+		return shelvesTime;
+	}
+	public void setReturnMessage(String returnMessage) {
+		this.returnMessage = returnMessage;
+	}
+
+	public String getReturnMessage() {
+		return returnMessage;
+	}
+	public void setAccountingStatus(String accountingStatus) {
+		this.accountingStatus = accountingStatus;
+	}
+
+	public String getAccountingStatus() {
+		return accountingStatus;
+	}
+	public void setAccountingTime(Date accountingTime) {
+		this.accountingTime = accountingTime;
+	}
+
+	public Date getAccountingTime() {
+		return accountingTime;
+	}
+	public void setAccountingMessage(String accountingMessage) {
+		this.accountingMessage = accountingMessage;
+	}
+
+	public String getAccountingMessage() {
+		return accountingMessage;
+	}
+	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;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("rawOrderInId", getRawOrderInId())
+			.append("factoryCode", getFactoryCode())
+			.append("whCode", getWhCode())
+			.append("waCode", getWaCode())
+			.append("wlCode", getWlCode())
+			.append("orderInType", getOrderInType())
+			.append("orderNo", getOrderNo())
+			.append("dnNo", getDnNo())
+			.append("poNo", getPoNo())
+			.append("poLine", getPoLine())
+			.append("poType", getPoType())
+			.append("materialCode", getMaterialCode())
+			.append("materialDesc", getMaterialDesc())
+			.append("unit", getUnit())
+			.append("buyerGroup", getBuyerGroup())
+			.append("supplyCode", getSupplyCode())
+			.append("sapFactoryCode", getSapFactoryCode())
+			.append("sendSpot", getSendSpot())
+			.append("requestAmount", getRequestAmount())
+			.append("receiptAmount", getReceiptAmount())
+			.append("shelvesAmount", getShelvesAmount())
+			.append("location", getLocation())
+			.append("requestTime", getRequestTime())
+			.append("qualityStatus", getQualityStatus())
+			.append("orderStatus", getOrderStatus())
+			.append("receiptOperator", getReceiptOperator())
+			.append("receiptTime", getReceiptTime())
+			.append("shelvesOperator", getShelvesOperator())
+			.append("returnAmount", getReturnAmount())
+			.append("returnName", getReturnName())
+			.append("returnTime", getReturnTime())
+			.append("returnStatus", getReturnStatus())
+			.append("shelvesTime", getShelvesTime())
+			.append("returnMessage", getReturnMessage())
+			.append("accountingStatus", getAccountingStatus())
+			.append("accountingTime", getAccountingTime())
+			.append("accountingMessage", getAccountingMessage())
+			.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())
+			.toString();
+	}
+}

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderInSn.java

@@ -0,0 +1,352 @@
+package com.op.wms.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-08-30
+ */
+public class WmsRawOrderInSn extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** 唯一序列号 */
+	private Long 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;
+
+	/** 托盘号 */
+	@Excel(name = "托盘号")
+	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(Long rawOrderInSnId) {
+		this.rawOrderInSnId = rawOrderInSnId;
+	}
+
+	public Long 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-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java

@@ -0,0 +1,61 @@
+package com.op.wms.mapper;
+
+import java.util.List;
+
+import com.op.wms.domain.WmsRawOrderIn;
+
+/**
+ * 包材到货单Mapper接口
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+public interface WmsRawOrderInMapper {
+	/**
+	 * 查询包材到货单
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 包材到货单
+	 */
+	public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId);
+
+	/**
+	 * 查询包材到货单列表
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 包材到货单集合
+	 */
+	public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 新增包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 修改包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 删除包材到货单
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
+
+	/**
+	 * 批量删除包材到货单
+	 * 
+	 * @param rawOrderInIds 需要删除的数据主键集合
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds);
+}

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java

@@ -0,0 +1,61 @@
+package com.op.wms.mapper;
+
+import java.util.List;
+
+import com.op.wms.domain.WmsRawOrderInSn;
+
+/**
+ * 原材料收货明细Mapper接口
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+public interface WmsRawOrderInSnMapper {
+	/**
+	 * 查询原材料收货明细
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 原材料收货明细
+	 */
+	public WmsRawOrderInSn selectWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId);
+
+	/**
+	 * 查询原材料收货明细列表
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 原材料收货明细集合
+	 */
+	public List<WmsRawOrderInSn> selectWmsRawOrderInSnList(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 新增原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	public int insertWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 修改原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	public int updateWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 删除原材料收货明细
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId);
+
+	/**
+	 * 批量删除原材料收货明细
+	 * 
+	 * @param rawOrderInSnIds 需要删除的数据主键集合
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInSnByRawOrderInSnIds(Long[] rawOrderInSnIds);
+}

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java

@@ -0,0 +1,60 @@
+package com.op.wms.service;
+
+import java.util.List;
+import com.op.wms.domain.WmsRawOrderIn;
+
+/**
+ * 包材到货单Service接口
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+public interface IWmsRawOrderInService {
+	/**
+	 * 查询包材到货单
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 包材到货单
+	 */
+	public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId);
+
+	/**
+	 * 查询包材到货单列表
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 包材到货单集合
+	 */
+	public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 新增包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 修改包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn);
+
+	/**
+	 * 批量删除包材到货单
+	 * 
+	 * @param rawOrderInIds 需要删除的包材到货单主键集合
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds);
+
+	/**
+	 * 删除包材到货单信息
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
+}

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInSnService.java

@@ -0,0 +1,60 @@
+package com.op.wms.service;
+
+import java.util.List;
+import com.op.wms.domain.WmsRawOrderInSn;
+
+/**
+ * 原材料收货明细Service接口
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+public interface IWmsRawOrderInSnService {
+	/**
+	 * 查询原材料收货明细
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 原材料收货明细
+	 */
+	public WmsRawOrderInSn selectWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId);
+
+	/**
+	 * 查询原材料收货明细列表
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 原材料收货明细集合
+	 */
+	public List<WmsRawOrderInSn> selectWmsRawOrderInSnList(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 新增原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	public int insertWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 修改原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	public int updateWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn);
+
+	/**
+	 * 批量删除原材料收货明细
+	 * 
+	 * @param rawOrderInSnIds 需要删除的原材料收货明细主键集合
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInSnByRawOrderInSnIds(Long[] rawOrderInSnIds);
+
+	/**
+	 * 删除原材料收货明细信息
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 结果
+	 */
+	public int deleteWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId);
+}

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java

@@ -0,0 +1,86 @@
+package com.op.wms.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.wms.mapper.WmsRawOrderInMapper;
+import com.op.wms.domain.WmsRawOrderIn;
+import com.op.wms.service.IWmsRawOrderInService;
+
+/**
+ * 包材到货单Service业务层处理
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+@Service
+public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
+	@Autowired
+	private WmsRawOrderInMapper wmsRawOrderInMapper;
+
+	/**
+	 * 查询包材到货单
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 包材到货单
+	 */
+	@Override
+	public WmsRawOrderIn selectWmsRawOrderInByRawOrderInId(String rawOrderInId) {
+		return wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInId(rawOrderInId);
+	}
+
+	/**
+	 * 查询包材到货单列表
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 包材到货单
+	 */
+	@Override
+	public List<WmsRawOrderIn> selectWmsRawOrderInList(WmsRawOrderIn wmsRawOrderIn) {
+		return wmsRawOrderInMapper.selectWmsRawOrderInList(wmsRawOrderIn);
+	}
+
+	/**
+	 * 新增包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	@Override
+	public int insertWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn) {
+		return wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);
+	}
+
+	/**
+	 * 修改包材到货单
+	 * 
+	 * @param wmsRawOrderIn 包材到货单
+	 * @return 结果
+	 */
+	@Override
+	public int updateWmsRawOrderIn(WmsRawOrderIn wmsRawOrderIn) {
+		return wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn);
+	}
+
+	/**
+	 * 批量删除包材到货单
+	 * 
+	 * @param rawOrderInIds 需要删除的包材到货单主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteWmsRawOrderInByRawOrderInIds(String[] rawOrderInIds) {
+		return wmsRawOrderInMapper.deleteWmsRawOrderInByRawOrderInIds(rawOrderInIds);
+	}
+
+	/**
+	 * 删除包材到货单信息
+	 * 
+	 * @param rawOrderInId 包材到货单主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId) {
+		return wmsRawOrderInMapper.deleteWmsRawOrderInByRawOrderInId(rawOrderInId);
+	}
+}

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInSnServiceImpl.java

@@ -0,0 +1,86 @@
+package com.op.wms.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.wms.mapper.WmsRawOrderInSnMapper;
+import com.op.wms.domain.WmsRawOrderInSn;
+import com.op.wms.service.IWmsRawOrderInSnService;
+
+/**
+ * 原材料收货明细Service业务层处理
+ * 
+ * @author Open Platform
+ * @date 2023-08-30
+ */
+@Service
+public class WmsRawOrderInSnServiceImpl implements IWmsRawOrderInSnService {
+	@Autowired
+	private WmsRawOrderInSnMapper wmsRawOrderInSnMapper;
+
+	/**
+	 * 查询原材料收货明细
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 原材料收货明细
+	 */
+	@Override
+	public WmsRawOrderInSn selectWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId) {
+		return wmsRawOrderInSnMapper.selectWmsRawOrderInSnByRawOrderInSnId(rawOrderInSnId);
+	}
+
+	/**
+	 * 查询原材料收货明细列表
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 原材料收货明细
+	 */
+	@Override
+	public List<WmsRawOrderInSn> selectWmsRawOrderInSnList(WmsRawOrderInSn wmsRawOrderInSn) {
+		return wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn);
+	}
+
+	/**
+	 * 新增原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	@Override
+	public int insertWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn) {
+		return wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn);
+	}
+
+	/**
+	 * 修改原材料收货明细
+	 * 
+	 * @param wmsRawOrderInSn 原材料收货明细
+	 * @return 结果
+	 */
+	@Override
+	public int updateWmsRawOrderInSn(WmsRawOrderInSn wmsRawOrderInSn) {
+		return wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn);
+	}
+
+	/**
+	 * 批量删除原材料收货明细
+	 * 
+	 * @param rawOrderInSnIds 需要删除的原材料收货明细主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteWmsRawOrderInSnByRawOrderInSnIds(Long[] rawOrderInSnIds) {
+		return wmsRawOrderInSnMapper.deleteWmsRawOrderInSnByRawOrderInSnIds(rawOrderInSnIds);
+	}
+
+	/**
+	 * 删除原材料收货明细信息
+	 * 
+	 * @param rawOrderInSnId 原材料收货明细主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteWmsRawOrderInSnByRawOrderInSnId(Long rawOrderInSnId) {
+		return wmsRawOrderInSnMapper.deleteWmsRawOrderInSnByRawOrderInSnId(rawOrderInSnId);
+	}
+}

op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.op.wms.mapper.BaseEquipmentMapper">
 
 	<resultMap type="BaseEquipment" id="BaseEquipmentResult">
@@ -26,14 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime"	column="create_time"	/>
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
-<!--		<result property="unitWorkingHours"	column="unit_working_hours"	/>-->
+		<result property="unitWorkingHours"	column="unit_working_hours"	/>
 		<result property="workshopSection"	column="workshop_section"	/>
 		<result property="equipmentLocation"	column="equipment_location"	/>
 		<result property="hourlyUnitPrice"	column="hourly_unit_price"	/>
 	</resultMap>
 
 	<sql id="selectBaseEquipmentVo">
-		select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price from base_equipment
+		select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price,unit_working_hours from base_equipment
 	</sql>
 
 	<select id="selectBaseEquipmentList" parameterType="BaseEquipment" resultMap="BaseEquipmentResult">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null "> and attr3 = #{attr3}</if>
 			<if test="attr4 != null "> and attr4 = #{attr4}</if>
-<!--			<if test="unitWorkingHours != null  and unitWorkingHours != ''"> and unit_working_hours = #{unitWorkingHours}</if>-->
+			<if test="unitWorkingHours != null  and unitWorkingHours != ''"> and unit_working_hours = #{unitWorkingHours}</if>
 			<if test="workshopSection != null  and workshopSection != ''"> and workshop_section = #{workshopSection}</if>
 			<if test="equipmentLocation != null  and equipmentLocation != ''"> and equipment_location = #{equipmentLocation}</if>
 			<if test="hourlyUnitPrice != null  and hourlyUnitPrice != ''"> and hourly_unit_price = #{hourlyUnitPrice}</if>
@@ -89,11 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createTime != null">create_time,</if>
 			<if test="updateBy != null">update_by,</if>
 			<if test="updateTime != null">update_time,</if>
-<!--			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours,</if>-->
+			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours,</if>
 			<if test="workshopSection != null and workshopSection != ''">workshop_section,</if>
 			<if test="equipmentLocation != null and equipmentLocation != ''">equipment_location,</if>
 			<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">hourly_unit_price,</if>
-		 </trim>
+		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
 			<if test="equipmentName != null">#{equipmentName},</if>
@@ -115,11 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createTime != null">#{createTime},</if>
 			<if test="updateBy != null">#{updateBy},</if>
 			<if test="updateTime != null">#{updateTime},</if>
-<!--			<if test="unitWorkingHours != null and unitWorkingHours != ''">#{unitWorkingHours},</if>-->
+			<if test="unitWorkingHours != null and unitWorkingHours != ''">#{unitWorkingHours},</if>
 			<if test="workshopSection != null and workshopSection != ''">#{workshopSection},</if>
 			<if test="equipmentLocation != null and equipmentLocation != ''">#{equipmentLocation},</if>
 			<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">#{hourlyUnitPrice},</if>
-		 </trim>
+		</trim>
 	</insert>
 
 	<update id="updateBaseEquipment" parameterType="BaseEquipment">
@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="createTime != null">create_time = #{createTime},</if>
 			<if test="updateBy != null">update_by = #{updateBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
-<!--			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours = #{unitWorkingHours},</if>-->
+			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours = #{unitWorkingHours},</if>
 			<if test="workshopSection != null and workshopSection != ''">workshop_section = #{workshopSection},</if>
 			<if test="equipmentLocation != null and equipmentLocation != ''">equipment_location = #{equipmentLocation},</if>
 			<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">hourly_unit_price = #{hourlyUnitPrice},</if>

op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="siteCode"	column="Site_Code"	/>
 		<result property="productionLineCode"	column="production_line_code"	/>
 		<result property="teamLeaderCode"	column="team_leader_code"	/>
+		<result property="teamLeaderName"	column="team_leader_name"	/>
 		<result property="planPostQuantity"	column="plan_post_quantity"	/>
 		<result property="actualPostQuantity"	column="actual_post_quantity"	/>
 		<result property="salaryType"	column="salary_type"	/>
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectBaseTeamTVo">
-		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t
+		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t
 	</sql>
 
 	<select id="selectBaseTeamTList" parameterType="BaseTeamT" resultMap="BaseTeamTResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null  and siteCode != ''"> and Site_Code = #{siteCode}</if>
 			<if test="productionLineCode != null  and productionLineCode != ''"> and production_line_code = #{productionLineCode}</if>
 			<if test="teamLeaderCode != null  and teamLeaderCode != ''"> and team_leader_code = #{teamLeaderCode}</if>
+			<if test="teamLeaderName != null  and teamLeaderName != ''"> and team_leader_name = #{teamLeaderName}</if>
 			<if test="planPostQuantity != null "> and plan_post_quantity = #{planPostQuantity}</if>
 			<if test="actualPostQuantity != null "> and actual_post_quantity = #{actualPostQuantity}</if>
 			<if test="salaryType != null  and salaryType != ''"> and salary_type = #{salaryType}</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">Site_Code,</if>
 			<if test="productionLineCode != null">production_line_code,</if>
 			<if test="teamLeaderCode != null">team_leader_code,</if>
+			<if test="teamLeaderName != null">team_leader_name,</if>
 			<if test="planPostQuantity != null">plan_post_quantity,</if>
 			<if test="actualPostQuantity != null">actual_post_quantity,</if>
 			<if test="salaryType != null">salary_type,</if>
@@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">#{siteCode},</if>
 			<if test="productionLineCode != null">#{productionLineCode},</if>
 			<if test="teamLeaderCode != null">#{teamLeaderCode},</if>
+			<if test="teamLeaderName != null">#{teamLeaderName},</if>
 			<if test="planPostQuantity != null">#{planPostQuantity},</if>
 			<if test="actualPostQuantity != null">#{actualPostQuantity},</if>
 			<if test="salaryType != null">#{salaryType},</if>
@@ -144,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">Site_Code = #{siteCode},</if>
 			<if test="productionLineCode != null">production_line_code = #{productionLineCode},</if>
 			<if test="teamLeaderCode != null">team_leader_code = #{teamLeaderCode},</if>
+			<if test="teamLeaderName != null">team_leader_name = #{teamLeaderName},</if>
 			<if test="planPostQuantity != null">plan_post_quantity = #{planPostQuantity},</if>
 			<if test="actualPostQuantity != null">actual_post_quantity = #{actualPostQuantity},</if>
 			<if test="salaryType != null">salary_type = #{salaryType},</if>

op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml

@@ -0,0 +1,307 @@
+<?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.wms.mapper.WmsRawOrderInMapper">
+	
+	<resultMap type="WmsRawOrderIn" id="WmsRawOrderInResult">
+		<result property="rawOrderInId"	column="raw_order_in_id"	/>
+		<result property="factoryCode"	column="factory_code"	/>
+		<result property="whCode"	column="wh_code"	/>
+		<result property="waCode"	column="wa_code"	/>
+		<result property="wlCode"	column="wl_code"	/>
+		<result property="orderInType"	column="order_in_type"	/>
+		<result property="orderNo"	column="order_no"	/>
+		<result property="dnNo"	column="dn_no"	/>
+		<result property="poNo"	column="po_no"	/>
+		<result property="poLine"	column="po_line"	/>
+		<result property="poType"	column="po_type"	/>
+		<result property="materialCode"	column="material_code"	/>
+		<result property="materialDesc"	column="material_desc"	/>
+		<result property="unit"	column="unit"	/>
+		<result property="buyerGroup"	column="buyer_group"	/>
+		<result property="supplyCode"	column="supply_code"	/>
+		<result property="sapFactoryCode"	column="sap_factory_code"	/>
+		<result property="sendSpot"	column="send_spot"	/>
+		<result property="requestAmount"	column="request_amount"	/>
+		<result property="receiptAmount"	column="receipt_amount"	/>
+		<result property="shelvesAmount"	column="shelves_amount"	/>
+		<result property="location"	column="location"	/>
+		<result property="requestTime"	column="request_time"	/>
+		<result property="qualityStatus"	column="quality_status"	/>
+		<result property="orderStatus"	column="order_status"	/>
+		<result property="receiptOperator"	column="receipt_operator"	/>
+		<result property="receiptTime"	column="receipt_time"	/>
+		<result property="shelvesOperator"	column="shelves_operator"	/>
+		<result property="returnAmount"	column="return_amount"	/>
+		<result property="returnName"	column="return_name"	/>
+		<result property="returnTime"	column="return_time"	/>
+		<result property="returnStatus"	column="return_status"	/>
+		<result property="shelvesTime"	column="shelves_time"	/>
+		<result property="returnMessage"	column="return_message"	/>
+		<result property="accountingStatus"	column="accounting_status"	/>
+		<result property="accountingTime"	column="accounting_time"	/>
+		<result property="accountingMessage"	column="accounting_message"	/>
+		<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"	/>
+	</resultMap>
+
+	<sql id="selectWmsRawOrderInVo">
+		select raw_order_in_id, factory_code, wh_code, wa_code, wl_code, order_in_type, order_no, dn_no, po_no, po_line, po_type, material_code, material_desc, unit, buyer_group, supply_code, sap_factory_code, send_spot, request_amount, receipt_amount, shelves_amount, location, request_time, quality_status, order_status, receipt_operator, receipt_time, shelves_operator, return_amount, return_name, return_time, return_status, shelves_time, return_message, accounting_status, accounting_time, accounting_message, 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 from wms_raw_order_in
+	</sql>
+
+	<select id="selectWmsRawOrderInList" parameterType="WmsRawOrderIn" resultMap="WmsRawOrderInResult">
+		<include refid="selectWmsRawOrderInVo"/>
+		<where>  
+			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<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="orderInType != null  and orderInType != ''"> and order_in_type = #{orderInType}</if>
+			<if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+			<if test="dnNo != null  and dnNo != ''"> and dn_no = #{dnNo}</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="poType != null  and poType != ''"> and po_type = #{poType}</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="unit != null  and unit != ''"> and unit = #{unit}</if>
+			<if test="buyerGroup != null  and buyerGroup != ''"> and buyer_group = #{buyerGroup}</if>
+			<if test="supplyCode != null  and supplyCode != ''"> and supply_code = #{supplyCode}</if>
+			<if test="sapFactoryCode != null  and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
+			<if test="sendSpot != null  and sendSpot != ''"> and send_spot = #{sendSpot}</if>
+			<if test="requestAmount != null "> and request_amount = #{requestAmount}</if>
+			<if test="receiptAmount != null "> and receipt_amount = #{receiptAmount}</if>
+			<if test="shelvesAmount != null "> and shelves_amount = #{shelvesAmount}</if>
+			<if test="location != null  and location != ''"> and location = #{location}</if>
+			<if test="requestTime != null "> and request_time = #{requestTime}</if>
+			<if test="qualityStatus != null  and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
+			<if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
+			<if test="receiptOperator != null  and receiptOperator != ''"> and receipt_operator = #{receiptOperator}</if>
+			<if test="receiptTime != null "> and receipt_time = #{receiptTime}</if>
+			<if test="shelvesOperator != null  and shelvesOperator != ''"> and shelves_operator = #{shelvesOperator}</if>
+			<if test="returnAmount != null "> and return_amount = #{returnAmount}</if>
+			<if test="returnName != null  and returnName != ''"> and return_name like concat('%', #{returnName}, '%')</if>
+			<if test="returnTime != null "> and return_time = #{returnTime}</if>
+			<if test="returnStatus != null  and returnStatus != ''"> and return_status = #{returnStatus}</if>
+			<if test="shelvesTime != null "> and shelves_time = #{shelvesTime}</if>
+			<if test="returnMessage != null  and returnMessage != ''"> and return_message = #{returnMessage}</if>
+			<if test="accountingStatus != null  and accountingStatus != ''"> and accounting_status = #{accountingStatus}</if>
+			<if test="accountingTime != null "> and accounting_time = #{accountingTime}</if>
+			<if test="accountingMessage != null  and accountingMessage != ''"> and accounting_message = #{accountingMessage}</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>
+		</where>
+	</select>
+	
+	<select id="selectWmsRawOrderInByRawOrderInId" parameterType="String" resultMap="WmsRawOrderInResult">
+		<include refid="selectWmsRawOrderInVo"/>
+		where raw_order_in_id = #{rawOrderInId}
+	</select>
+		
+	<insert id="insertWmsRawOrderIn" parameterType="WmsRawOrderIn">
+		insert into wms_raw_order_in
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="rawOrderInId != null">raw_order_in_id,</if>
+			<if test="factoryCode != null">factory_code,</if>
+			<if test="whCode != null">wh_code,</if>
+			<if test="waCode != null">wa_code,</if>
+			<if test="wlCode != null">wl_code,</if>
+			<if test="orderInType != null">order_in_type,</if>
+			<if test="orderNo != null">order_no,</if>
+			<if test="dnNo != null">dn_no,</if>
+			<if test="poNo != null">po_no,</if>
+			<if test="poLine != null">po_line,</if>
+			<if test="poType != null">po_type,</if>
+			<if test="materialCode != null">material_code,</if>
+			<if test="materialDesc != null">material_desc,</if>
+			<if test="unit != null">unit,</if>
+			<if test="buyerGroup != null">buyer_group,</if>
+			<if test="supplyCode != null">supply_code,</if>
+			<if test="sapFactoryCode != null">sap_factory_code,</if>
+			<if test="sendSpot != null">send_spot,</if>
+			<if test="requestAmount != null">request_amount,</if>
+			<if test="receiptAmount != null">receipt_amount,</if>
+			<if test="shelvesAmount != null">shelves_amount,</if>
+			<if test="location != null">location,</if>
+			<if test="requestTime != null">request_time,</if>
+			<if test="qualityStatus != null">quality_status,</if>
+			<if test="orderStatus != null">order_status,</if>
+			<if test="receiptOperator != null">receipt_operator,</if>
+			<if test="receiptTime != null">receipt_time,</if>
+			<if test="shelvesOperator != null">shelves_operator,</if>
+			<if test="returnAmount != null">return_amount,</if>
+			<if test="returnName != null">return_name,</if>
+			<if test="returnTime != null">return_time,</if>
+			<if test="returnStatus != null">return_status,</if>
+			<if test="shelvesTime != null">shelves_time,</if>
+			<if test="returnMessage != null">return_message,</if>
+			<if test="accountingStatus != null">accounting_status,</if>
+			<if test="accountingTime != null">accounting_time,</if>
+			<if test="accountingMessage != null">accounting_message,</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>
+		 </trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="rawOrderInId != null">#{rawOrderInId},</if>
+			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="whCode != null">#{whCode},</if>
+			<if test="waCode != null">#{waCode},</if>
+			<if test="wlCode != null">#{wlCode},</if>
+			<if test="orderInType != null">#{orderInType},</if>
+			<if test="orderNo != null">#{orderNo},</if>
+			<if test="dnNo != null">#{dnNo},</if>
+			<if test="poNo != null">#{poNo},</if>
+			<if test="poLine != null">#{poLine},</if>
+			<if test="poType != null">#{poType},</if>
+			<if test="materialCode != null">#{materialCode},</if>
+			<if test="materialDesc != null">#{materialDesc},</if>
+			<if test="unit != null">#{unit},</if>
+			<if test="buyerGroup != null">#{buyerGroup},</if>
+			<if test="supplyCode != null">#{supplyCode},</if>
+			<if test="sapFactoryCode != null">#{sapFactoryCode},</if>
+			<if test="sendSpot != null">#{sendSpot},</if>
+			<if test="requestAmount != null">#{requestAmount},</if>
+			<if test="receiptAmount != null">#{receiptAmount},</if>
+			<if test="shelvesAmount != null">#{shelvesAmount},</if>
+			<if test="location != null">#{location},</if>
+			<if test="requestTime != null">#{requestTime},</if>
+			<if test="qualityStatus != null">#{qualityStatus},</if>
+			<if test="orderStatus != null">#{orderStatus},</if>
+			<if test="receiptOperator != null">#{receiptOperator},</if>
+			<if test="receiptTime != null">#{receiptTime},</if>
+			<if test="shelvesOperator != null">#{shelvesOperator},</if>
+			<if test="returnAmount != null">#{returnAmount},</if>
+			<if test="returnName != null">#{returnName},</if>
+			<if test="returnTime != null">#{returnTime},</if>
+			<if test="returnStatus != null">#{returnStatus},</if>
+			<if test="shelvesTime != null">#{shelvesTime},</if>
+			<if test="returnMessage != null">#{returnMessage},</if>
+			<if test="accountingStatus != null">#{accountingStatus},</if>
+			<if test="accountingTime != null">#{accountingTime},</if>
+			<if test="accountingMessage != null">#{accountingMessage},</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>
+		 </trim>
+	</insert>
+
+	<update id="updateWmsRawOrderIn" parameterType="WmsRawOrderIn">
+		update wms_raw_order_in
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<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="orderInType != null">order_in_type = #{orderInType},</if>
+			<if test="orderNo != null">order_no = #{orderNo},</if>
+			<if test="dnNo != null">dn_no = #{dnNo},</if>
+			<if test="poNo != null">po_no = #{poNo},</if>
+			<if test="poLine != null">po_line = #{poLine},</if>
+			<if test="poType != null">po_type = #{poType},</if>
+			<if test="materialCode != null">material_code = #{materialCode},</if>
+			<if test="materialDesc != null">material_desc = #{materialDesc},</if>
+			<if test="unit != null">unit = #{unit},</if>
+			<if test="buyerGroup != null">buyer_group = #{buyerGroup},</if>
+			<if test="supplyCode != null">supply_code = #{supplyCode},</if>
+			<if test="sapFactoryCode != null">sap_factory_code = #{sapFactoryCode},</if>
+			<if test="sendSpot != null">send_spot = #{sendSpot},</if>
+			<if test="requestAmount != null">request_amount = #{requestAmount},</if>
+			<if test="receiptAmount != null">receipt_amount = #{receiptAmount},</if>
+			<if test="shelvesAmount != null">shelves_amount = #{shelvesAmount},</if>
+			<if test="location != null">location = #{location},</if>
+			<if test="requestTime != null">request_time = #{requestTime},</if>
+			<if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
+			<if test="orderStatus != null">order_status = #{orderStatus},</if>
+			<if test="receiptOperator != null">receipt_operator = #{receiptOperator},</if>
+			<if test="receiptTime != null">receipt_time = #{receiptTime},</if>
+			<if test="shelvesOperator != null">shelves_operator = #{shelvesOperator},</if>
+			<if test="returnAmount != null">return_amount = #{returnAmount},</if>
+			<if test="returnName != null">return_name = #{returnName},</if>
+			<if test="returnTime != null">return_time = #{returnTime},</if>
+			<if test="returnStatus != null">return_status = #{returnStatus},</if>
+			<if test="shelvesTime != null">shelves_time = #{shelvesTime},</if>
+			<if test="returnMessage != null">return_message = #{returnMessage},</if>
+			<if test="accountingStatus != null">accounting_status = #{accountingStatus},</if>
+			<if test="accountingTime != null">accounting_time = #{accountingTime},</if>
+			<if test="accountingMessage != null">accounting_message = #{accountingMessage},</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>
+		</trim>
+		where raw_order_in_id = #{rawOrderInId}
+	</update>
+
+	<delete id="deleteWmsRawOrderInByRawOrderInId" parameterType="String">
+		delete from wms_raw_order_in where raw_order_in_id = #{rawOrderInId}
+	</delete>
+
+	<delete id="deleteWmsRawOrderInByRawOrderInIds" parameterType="String">
+		delete from wms_raw_order_in where raw_order_in_id in 
+		<foreach item="rawOrderInId" collection="array" open="(" separator="," close=")">
+			#{rawOrderInId}
+		</foreach>
+	</delete>
+</mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml

@@ -0,0 +1,185 @@
+<?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.wms.mapper.WmsRawOrderInSnMapper">
+	
+	<resultMap type="WmsRawOrderInSn" id="WmsRawOrderInSnResult">
+		<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="selectWmsRawOrderInSnVo">
+		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="selectWmsRawOrderInSnList" parameterType="WmsRawOrderInSn" resultMap="WmsRawOrderInSnResult">
+		<include refid="selectWmsRawOrderInSnVo"/>
+		<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="selectWmsRawOrderInSnByRawOrderInSnId" parameterType="Long" resultMap="WmsRawOrderInSnResult">
+		<include refid="selectWmsRawOrderInSnVo"/>
+		where raw_order_in_sn_id = #{rawOrderInSnId}
+	</select>
+		
+	<insert id="insertWmsRawOrderInSn" parameterType="WmsRawOrderInSn" useGeneratedKeys="true" keyProperty="rawOrderInSnId">
+		insert into wms_raw_order_in_sn
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<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="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="updateWmsRawOrderInSn" parameterType="WmsRawOrderInSn">
+		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="deleteWmsRawOrderInSnByRawOrderInSnId" parameterType="Long">
+		delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId}
+	</delete>
+
+	<delete id="deleteWmsRawOrderInSnByRawOrderInSnIds" 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>