wms成品调拨部分代码修改27

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

@@ -1,6 +1,14 @@
 package com.op.wms.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 成品调拨单
@@ -12,4 +20,497 @@ public class WmsAllocationOutEmbryo extends BaseEntity {
      * ID
      */
     private String id;
+
+    /**
+     * 交货单号
+     */
+    @Excel(name = "交货单号")
+    private String deliveryOrder;
+
+    /**
+     * 项次
+     */
+    @Excel(name = "项次")
+    private String itemNumber;
+
+    /**
+     * 工厂编码
+     */
+    @Excel(name = "工厂编码")
+    private String factoryCode;
+
+    /**
+     * 仓库编码
+     */
+    @Excel(name = "仓库编码")
+    private String whCode;
+
+    /**
+     * 库区编码
+     */
+    @Excel(name = "库区编码")
+    private String waCode;
+
+    /**
+     * 库位编码
+     */
+    @Excel(name = "库位编码")
+    private String wlCode;
+
+    /**
+     * 出库地点
+     */
+    @Excel(name = "出库地点")
+    private String deliveryPlace;
+
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    /**
+     * 产品编码
+     */
+    @Excel(name = "产品编码")
+    private String productCode;
+
+    /**
+     * 产品分类
+     */
+    @Excel(name = "产品分类")
+    private String productSort;
+
+    /**
+     * 规格型号
+     */
+    @Excel(name = "规格型号")
+    private String specification;
+
+    /**
+     * 单位
+     */
+    @Excel(name = "单位")
+    private String unitOfMeasure;
+
+    /**
+     * 批号
+     */
+    @Excel(name = "批次号")
+    private String lotNumber;
+
+    /**
+     * 计划出库数量
+     */
+    @Excel(name = "计划出库数量")
+    private BigDecimal planQuantity;
+
+    /**
+     * 出库数量
+     */
+    @Excel(name = "出库数量")
+    private BigDecimal outQuantity;
+
+    /**
+     * 出库状态--0进行，1完成
+     */
+    @Excel(name = "出库状态")
+    private String status;
+
+    /**
+     * 过账SAP状态
+     */
+    @Excel(name = "过账SAP状态")
+    private String sapStatus;
+
+    /**
+     * 过账SAP凭证
+     */
+    @Excel(name = "过账SAP凭证")
+    private String sapProof;
+
+    /**
+     * 过账SAP返回信息
+     */
+    @Excel(name = "过账SAP返回信息")
+    private String sapMessage;
+
+    /**
+     * 出库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outDate;
+
+    /**
+     * 预留字段1
+     */
+    @Excel(name = "预留字段1")
+    private String attr1;
+
+    /**
+     * 预留字段2
+     */
+    @Excel(name = "预留字段2")
+    private String attr2;
+
+    /**
+     * 预留字段3
+     */
+    @Excel(name = "预留字段3")
+    private String attr3;
+
+    /**
+     * 预留字段4
+     */
+    @Excel(name = "预留字段4")
+    private String attr4;
+
+    /**
+     * 预留字段5
+     */
+    @Excel(name = "预留字段5")
+    private String attr5;
+
+    /**
+     * 预留字段6
+     */
+    @Excel(name = "预留字段6")
+    private String attr6;
+
+    /**
+     * 预留字段7
+     */
+    @Excel(name = "预留字段7")
+    private String attr7;
+
+    /**
+     * 预留字段8
+     */
+    @Excel(name = "预留字段8")
+    private String attr8;
+
+    /**
+     * 预留字段9
+     */
+    @Excel(name = "预留字段9")
+    private String attr9;
+
+    /**
+     * 预留字段10
+     */
+    @Excel(name = "预留字段10")
+    private String attr10;
+    /**
+     * 有效标记
+     */
+    @Excel(name = "有效标记")
+    private String activeFlag;
+    private List<WmsProductPutTrayCode> wmsProductPutTrayCodeList;
+
+    public List<WmsProductPutTrayCode> getWmsProductPutTrayCodeList() {
+        return wmsProductPutTrayCodeList;
+    }
+
+    public void setWmsProductPutTrayCodeList(List<WmsProductPutTrayCode> wmsProductPutTrayCodeList) {
+        this.wmsProductPutTrayCodeList = wmsProductPutTrayCodeList;
+    }
+
+    public String getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(String activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setDeliveryOrder(String deliveryOrder) {
+        this.deliveryOrder = deliveryOrder;
+    }
+
+    public String getDeliveryOrder() {
+        return deliveryOrder;
+    }
+
+    public void setItemNumber(String itemNumber) {
+        this.itemNumber = itemNumber;
+    }
+
+    public String getItemNumber() {
+        return itemNumber;
+    }
+
+    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 setDeliveryPlace(String deliveryPlace) {
+        this.deliveryPlace = deliveryPlace;
+    }
+
+    public String getDeliveryPlace() {
+        return deliveryPlace;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductSort(String productSort) {
+        this.productSort = productSort;
+    }
+
+    public String getProductSort() {
+        return productSort;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setUnitOfMeasure(String unitOfMeasure) {
+        this.unitOfMeasure = unitOfMeasure;
+    }
+
+    public String getUnitOfMeasure() {
+        return unitOfMeasure;
+    }
+
+    public void setLotNumber(String lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+    public String getLotNumber() {
+        return lotNumber;
+    }
+
+    public void setPlanQuantity(BigDecimal planQuantity) {
+        this.planQuantity = planQuantity;
+    }
+
+    public BigDecimal getPlanQuantity() {
+        return planQuantity;
+    }
+
+    public void setOutQuantity(BigDecimal outQuantity) {
+        this.outQuantity = outQuantity;
+    }
+
+    public BigDecimal getOutQuantity() {
+        return outQuantity;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setSapStatus(String sapStatus) {
+        this.sapStatus = sapStatus;
+    }
+
+    public String getSapStatus() {
+        return sapStatus;
+    }
+
+    public void setSapProof(String sapProof) {
+        this.sapProof = sapProof;
+    }
+
+    public String getSapProof() {
+        return sapProof;
+    }
+
+    public void setSapMessage(String sapMessage) {
+        this.sapMessage = sapMessage;
+    }
+
+    public String getSapMessage() {
+        return sapMessage;
+    }
+
+    public void setOutDate(Date outDate) {
+        this.outDate = outDate;
+    }
+
+    public Date getOutDate() {
+        return outDate;
+    }
+
+    public void setAttr1(String attr1) {
+        this.attr1 = attr1;
+    }
+
+    public String getAttr1() {
+        return attr1;
+    }
+
+    public void setAttr2(String attr2) {
+        this.attr2 = attr2;
+    }
+
+    public String getAttr2() {
+        return attr2;
+    }
+
+    public void setAttr3(String attr3) {
+        this.attr3 = attr3;
+    }
+
+    public String getAttr3() {
+        return attr3;
+    }
+
+    public void setAttr4(String attr4) {
+        this.attr4 = attr4;
+    }
+
+    public String getAttr4() {
+        return attr4;
+    }
+
+    public void setAttr5(String attr5) {
+        this.attr5 = attr5;
+    }
+
+    public String getAttr5() {
+        return attr5;
+    }
+
+    public void setAttr6(String attr6) {
+        this.attr6 = attr6;
+    }
+
+    public String getAttr6() {
+        return attr6;
+    }
+
+    public void setAttr7(String attr7) {
+        this.attr7 = attr7;
+    }
+
+    public String getAttr7() {
+        return attr7;
+    }
+
+    public void setAttr8(String attr8) {
+        this.attr8 = attr8;
+    }
+
+    public String getAttr8() {
+        return attr8;
+    }
+
+    public void setAttr9(String attr9) {
+        this.attr9 = attr9;
+    }
+
+    public String getAttr9() {
+        return attr9;
+    }
+
+    public void setAttr10(String attr10) {
+        this.attr10 = attr10;
+    }
+
+    public String getAttr10() {
+        return attr10;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deliveryOrder", getDeliveryOrder())
+                .append("itemNumber", getItemNumber())
+                .append("factoryCode", getFactoryCode())
+                .append("whCode", getWhCode())
+                .append("waCode", getWaCode())
+                .append("wlCode", getWlCode())
+                .append("deliveryPlace", getDeliveryPlace())
+                .append("productName", getProductName())
+                .append("productCode", getProductCode())
+                .append("productSort", getProductSort())
+                .append("specification", getSpecification())
+                .append("unitOfMeasure", getUnitOfMeasure())
+                .append("lotNumber", getLotNumber())
+                .append("planQuantity", getPlanQuantity())
+                .append("outQuantity", getOutQuantity())
+                .append("status", getStatus())
+                .append("sapStatus", getSapStatus())
+                .append("sapProof", getSapProof())
+                .append("sapMessage", getSapMessage())
+                .append("outDate", getOutDate())
+                .append("attr1", getAttr1())
+                .append("attr2", getAttr2())
+                .append("attr3", getAttr3())
+                .append("attr4", getAttr4())
+                .append("attr5", getAttr5())
+                .append("attr6", getAttr6())
+                .append("attr7", getAttr7())
+                .append("attr8", getAttr8())
+                .append("attr9", getAttr9())
+                .append("attr10", getAttr10())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.op.wms.mapper;
 
 import java.util.List;
 
+import com.op.wms.domain.WmsAllocationOutEmbryo;
 import com.op.wms.domain.WmsSellOutEmbryo;
 import org.apache.ibatis.annotations.Param;
 
@@ -76,4 +77,6 @@ public interface WmsSellOutEmbryoMapper {
      * @return
      */
     public WmsSellOutEmbryo selectWmsSellOutEmbryoByOrderCodeAndProductCode(@Param("deliveryOrder") String deliveryOrder, @Param("productCode") String productCode);
+
+    List<WmsAllocationOutEmbryo> selectWmsAllocationOutEmbryoList(WmsAllocationOutEmbryo wmsAllocationOutEmbryo);
 }

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

@@ -885,9 +885,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     }
 
     @Override
-    public List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
-
-
-        return null;
+    public List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsAllocationOutEmbryo) {
+        DynamicDataSourceContextHolder.push("ds_" + wmsAllocationOutEmbryo.getFactoryCode());
+   List<WmsAllocationOutEmbryo>   wmsAllocationOutEmbryoList=  wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoList(wmsAllocationOutEmbryo);
+        return wmsAllocationOutEmbryoList;
     }
 }

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

@@ -44,6 +44,45 @@
         <result property="activeFlag" column="active_flag"/>
     </resultMap>
 
+    <resultMap type="WmsAllocationOutEmbryo" id="WmsAllocationOutEmbryoResult">
+        <result property="id" column="id"/>
+        <result property="deliveryOrder" column="delivery_order"/>
+        <result property="itemNumber" column="Item_number"/>
+        <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="deliveryPlace" column="delivery_place"/>
+        <result property="productName" column="product_name"/>
+        <result property="productCode" column="product_code"/>
+        <result property="productSort" column="product_sort"/>
+        <result property="specification" column="specification"/>
+        <result property="unitOfMeasure" column="unit_of_measure"/>
+        <result property="lotNumber" column="lot_number"/>
+        <result property="planQuantity" column="plan_quantity"/>
+        <result property="outQuantity" column="out_quantity"/>
+        <result property="status" column="status"/>
+        <result property="sapStatus" column="SAP_status"/>
+        <result property="sapProof" column="SAP_proof"/>
+        <result property="sapMessage" column="SAP_message"/>
+        <result property="outDate" column="out_date"/>
+        <result property="attr1" column="attr1"/>
+        <result property="attr2" column="attr2"/>
+        <result property="attr3" column="attr3"/>
+        <result property="attr4" column="attr4"/>
+        <result property="attr5" column="attr5"/>
+        <result property="attr6" column="attr6"/>
+        <result property="attr7" column="attr7"/>
+        <result property="attr8" column="attr8"/>
+        <result property="attr9" column="attr9"/>
+        <result property="attr10" column="attr10"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="activeFlag" column="active_flag"/>
+    </resultMap>
     <sql id="selectWmsSellOutEmbryoVo">
 		select id, delivery_order, Item_number,active_flag, factory_code, wh_code, wa_code, wl_code, delivery_place, product_name, product_code, product_sort, specification, unit_of_measure, lot_number, plan_quantity, out_quantity, status, SAP_status, SAP_proof, SAP_message, out_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time, remark from wms_sell_out_embryo
 	</sql>
@@ -242,4 +281,81 @@
             #{id}
         </foreach>
     </delete>
+    <select id="selectWmsAllocationOutEmbryoList"   resultMap="WmsSellOutEmbryoResult">
+        SELECT
+        id,
+        delivery_order,
+        Item_number,
+        active_flag,
+        factory_code,
+        wh_code,
+        wa_code,
+        wl_code,
+        delivery_place,
+        product_name,
+        product_code,
+        product_sort,
+        specification,
+        unit_of_measure,
+        lot_number,
+        plan_quantity,
+        out_quantity,
+        status,
+        SAP_status,
+        SAP_proof,
+        SAP_message,
+        out_date,
+        attr1,
+        attr2,
+        attr3,
+        attr4,
+        attr5,
+        attr6,
+        attr7,
+        attr8,
+        attr9,
+        attr10,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark
+        FROM
+        wms_allocation_out_embryo
+        <where>
+            <if test="deliveryOrder != null  and deliveryOrder != ''">and delivery_order = #{deliveryOrder}</if>
+            <if test="itemNumber != null  and itemNumber != ''">and Item_number = #{itemNumber}</if>
+            <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="deliveryPlace != null  and deliveryPlace != ''">and delivery_place = #{deliveryPlace}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+            <if test="productSort != null  and productSort != ''">and product_sort = #{productSort}</if>
+            <if test="specification != null  and specification != ''">and specification = #{specification}</if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''">and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="lotNumber != null  and lotNumber != ''">and lot_number = #{lotNumber}</if>
+            <if test="planQuantity != null ">and plan_quantity = #{planQuantity}</if>
+            <if test="outQuantity != null ">and out_quantity = #{outQuantity}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="sapStatus != null  and sapStatus != ''">and SAP_status = #{sapStatus}</if>
+            <if test="sapProof != null  and sapProof != ''">and SAP_proof = #{sapProof}</if>
+            <if test="sapMessage != null  and sapMessage != ''">and SAP_message = #{sapMessage}</if>
+            <if test="outDate != null ">and out_date = #{outDate}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
+            <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
+            <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
+            <if test="attr4 != null  and attr4 != ''">and attr4 = #{attr4}</if>
+            <if test="attr5 != null  and attr5 != ''">and attr5 = #{attr5}</if>
+            <if test="attr6 != null  and attr6 != ''">and attr6 = #{attr6}</if>
+            <if test="attr7 != null  and attr7 != ''">and attr7 = #{attr7}</if>
+            <if test="attr8 != null  and attr8 != ''">and attr8 = #{attr8}</if>
+            <if test="attr9 != null  and attr9 != ''">and attr9 = #{attr9}</if>
+            <if test="attr10 != null  and attr10 != ''">and attr10 = #{attr10}</if>
+        </where>
+    </select>
 </mapper>