Merge remote-tracking branch 'origin/master'

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

@@ -16,7 +16,60 @@ public class OrderLine extends BaseEntity {
     private String stationNo;//包装线
 
 
+    private String materialCode;
+    private String        materialDesc;
+    private BigDecimal  planNumber;
+    private String     siteCode;
+    private String unit;
+    private String       userDefined2;
 
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialDesc() {
+        return materialDesc;
+    }
+
+    public void setMaterialDesc(String materialDesc) {
+        this.materialDesc = materialDesc;
+    }
+
+    public BigDecimal getPlanNumber() {
+        return planNumber;
+    }
+
+    public void setPlanNumber(BigDecimal planNumber) {
+        this.planNumber = planNumber;
+    }
+
+    public String getSiteCode() {
+        return siteCode;
+    }
+
+    public void setSiteCode(String siteCode) {
+        this.siteCode = siteCode;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getUserDefined2() {
+        return userDefined2;
+    }
+
+    public void setUserDefined2(String userDefined2) {
+        this.userDefined2 = userDefined2;
+    }
 
     List<OrderLine> list;
 

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

@@ -0,0 +1,73 @@
+package com.op.wms.domain;
+
+import java.io.Serializable;
+
+/**
+ * 反冲类型的领料过账接口
+ * auth YangWL
+ *
+ * MATNR	CHAR	18	0	物料号 	必填
+ * PLANT	CHAR	4	0	工厂	必填
+ * GR_RCPT	CHAR	12	0	收货方/运达方 	选填
+ * LGORT	CHAR	4	0	库存地点	必填
+ * UMLGO	CHAR	4	0	收货/发货库存地点	选填
+ * QUANTITY	QUAN	13	3	数量	必填
+ * MEINS	UNIT	3	0	条目单位	必填
+ * BATCH	CHAR	10	0	批号	必填
+ * MOVE_BATCH	CHAR	10	0	收货/发货批量	选填
+ */
+
+
+public class SapBackflushMPQuery implements Serializable {
+    /**
+     * S_EBELN	采购订单号
+     * S_EBELP	行项目
+     * S_MATNR	物料号
+     * S_PWERK  工厂
+     */
+    private String ebeln;
+    private String ebelp;
+    private String matnr;
+    private String pwerk;
+    private String factoryCode;//
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
+
+    public String getEbeln() {
+        return ebeln;
+    }
+
+    public void setEbeln(String ebeln) {
+        this.ebeln = ebeln;
+    }
+
+    public String getEbelp() {
+        return ebelp;
+    }
+
+    public void setEbelp(String ebelp) {
+        this.ebelp = ebelp;
+    }
+
+    public String getMatnr() {
+        return matnr;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public String getPwerk() {
+        return pwerk;
+    }
+
+    public void setPwerk(String pwerk) {
+        this.pwerk = pwerk;
+    }
+}