修改

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -172,4 +173,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return success("回传成功");
     }
 
+
+
+
+
 }

src/main/java/com/steerinfo/dil/model/AmsSaleMaterial.java

@@ -146,6 +146,18 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否控制数量",required=false)
     private String controlQuantity;
 
+    /**
+     * 制单日期(SALE_MAKE_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="制单日期",required=false)
+    private Date saleMakeDate;
+
+    /**
+     * 计划件数(MATERIAL_PLAN_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="计划件数",required=false)
+    private BigDecimal materialPlanNumber;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -342,6 +354,22 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         this.controlQuantity = controlQuantity == null ? null : controlQuantity.trim();
     }
 
+    public Date getSaleMakeDate() {
+        return saleMakeDate;
+    }
+
+    public void setSaleMakeDate(Date saleMakeDate) {
+        this.saleMakeDate = saleMakeDate;
+    }
+
+    public BigDecimal getMaterialPlanNumber() {
+        return materialPlanNumber;
+    }
+
+    public void setMaterialPlanNumber(BigDecimal materialPlanNumber) {
+        this.materialPlanNumber = materialPlanNumber;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -371,6 +399,8 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         sb.append(", transferInPlanDate=").append(transferInPlanDate);
         sb.append(", transferOutPlanDate=").append(transferOutPlanDate);
         sb.append(", controlQuantity=").append(controlQuantity);
+        sb.append(", saleMakeDate=").append(saleMakeDate);
+        sb.append(", materialPlanNumber=").append(materialPlanNumber);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -446,6 +446,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     }
                     if (materialNumber != null && !"".equals(materialNumber)) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                        amsSaleMaterial.setMaterialPlanNumber(new BigDecimal(materialNumber));
                     }
                     result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
                 }
@@ -548,6 +549,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     if (materialNumber != null && !
                             "".equals(materialNumber)) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                        amsSaleMaterial.setMaterialPlanNumber(new BigDecimal(materialNumber));
                     }
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
                     amsSaleMaterial.setEasPrimaryId(easPrimaryId);
@@ -809,6 +811,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleMaterial.setMaterialId(materialId);
                 //设置辅助数量
                 amsSaleMaterial.setMaterialNumber(DataChange.dataToBigDecimal(auxiliaryQuantity));
+                amsSaleMaterial.setMaterialPlanNumber(DataChange.dataToBigDecimal(auxiliaryQuantity));
                 amsSaleMaterial.setInsertTime(new Date());
                 amsSaleMaterial.setInsertUsername("金蝶");
                 amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));

src/main/resources/com/steerinfo/dil/mapper/AmsSaleMaterialMapper.xml

@@ -25,20 +25,23 @@
         <result column="TRANSFER_IN_PLAN_DATE" jdbcType="TIMESTAMP" property="transferInPlanDate" />
         <result column="TRANSFER_OUT_PLAN_DATE" jdbcType="TIMESTAMP" property="transferOutPlanDate" />
         <result column="CONTROL_QUANTITY" jdbcType="VARCHAR" property="controlQuantity" />
+        <result column="SALE_MAKE_DATE" jdbcType="TIMESTAMP" property="saleMakeDate" />
+        <result column="MATERIAL_PLAN_NUMBER" jdbcType="DECIMAL" property="materialPlanNumber" />
     </resultMap>
     <sql id="columns">
         SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, SALE_WAREHOUSE, STEEL_METER, IS_POUND_SALE, METER_WEIGHT, TRANSFER_OUT_OF_WAREHOUSE,
     TRANSFER_IN_OF_WAREHOUSE, INVENTORY_TYPE, INVENTORY_STATUS, TRANSFER_IN_PLAN_DATE,
-    TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY
+    TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY, SALE_MAKE_DATE, MATERIAL_PLAN_NUMBER
     </sql>
     <sql id="columns_alias">
         t.SALE_MATERIAL_ID, t.SALE_ORDER_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_NUMBER,
     t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
     t.INSERT_UPDATE_REMARK, t.DELETED, t.SALE_WAREHOUSE, t.STEEL_METER, t.IS_POUND_SALE,
     t.METER_WEIGHT, t.TRANSFER_OUT_OF_WAREHOUSE, t.TRANSFER_IN_OF_WAREHOUSE, t.INVENTORY_TYPE,
-    t.INVENTORY_STATUS, t.TRANSFER_IN_PLAN_DATE, t.TRANSFER_OUT_PLAN_DATE, t.CONTROL_QUANTITY
+    t.INVENTORY_STATUS, t.TRANSFER_IN_PLAN_DATE, t.TRANSFER_OUT_PLAN_DATE, t.CONTROL_QUANTITY,
+    t.SALE_MAKE_DATE, t.MATERIAL_PLAN_NUMBER
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMS_SALE_MATERIAL
@@ -117,6 +120,12 @@
             <if test="controlQuantity != null and controlQuantity != ''">
                 and CONTROL_QUANTITY = #{controlQuantity}
             </if>
+            <if test="saleMakeDate != null">
+                and TO_CHAR(SALE_MAKE_DATE,'yyyy-MM-dd') = #{saleMakeDate}
+            </if>
+            <if test="materialPlanNumber != null">
+                and MATERIAL_PLAN_NUMBER = #{materialPlanNumber}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -190,6 +199,12 @@
             <if test="controlQuantity != null and controlQuantity != ''">
                 and CONTROL_QUANTITY LIKE '%${controlQuantity}%'
             </if>
+            <if test="saleMakeDate != null">
+                and TO_CHAR(SALE_MAKE_DATE,'yyyy-MM-dd') = #{saleMakeDate}
+            </if>
+            <if test="materialPlanNumber != null">
+                and MATERIAL_PLAN_NUMBER = #{materialPlanNumber}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -265,6 +280,12 @@
         <if test="controlQuantity != null and controlQuantity != ''">
             or CONTROL_QUANTITY = #{controlQuantity}
         </if>
+        <if test="saleMakeDate != null">
+            or TO_CHAR(SALE_MAKE_DATE,'yyyy-MM-dd') = '#{saleMakeDate}'
+        </if>
+        <if test="materialPlanNumber != null">
+            or MATERIAL_PLAN_NUMBER = #{materialPlanNumber}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL (SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID,
@@ -274,7 +295,8 @@
                                        SALE_WAREHOUSE, STEEL_METER, IS_POUND_SALE,
                                        METER_WEIGHT, TRANSFER_OUT_OF_WAREHOUSE, TRANSFER_IN_OF_WAREHOUSE,
                                        INVENTORY_TYPE, INVENTORY_STATUS, TRANSFER_IN_PLAN_DATE,
-                                       TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY)
+                                       TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY,
+                                       SALE_MAKE_DATE, MATERIAL_PLAN_NUMBER)
         values (#{saleMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
                 #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL}, #{easPrimaryId,jdbcType=VARCHAR},
                 #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
@@ -282,7 +304,8 @@
                 #{saleWarehouse,jdbcType=VARCHAR}, #{steelMeter,jdbcType=DECIMAL}, #{isPoundSale,jdbcType=DECIMAL},
                 #{meterWeight,jdbcType=DECIMAL}, #{transferOutOfWarehouse,jdbcType=VARCHAR}, #{transferInOfWarehouse,jdbcType=VARCHAR},
                 #{inventoryType,jdbcType=VARCHAR}, #{inventoryStatus,jdbcType=VARCHAR}, #{transferInPlanDate,jdbcType=TIMESTAMP},
-                #{transferOutPlanDate,jdbcType=TIMESTAMP}, #{controlQuantity,jdbcType=VARCHAR})
+                #{transferOutPlanDate,jdbcType=TIMESTAMP}, #{controlQuantity,jdbcType=VARCHAR},
+                #{saleMakeDate,jdbcType=TIMESTAMP}, #{materialPlanNumber,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL
@@ -356,6 +379,12 @@
             <if test="controlQuantity != null">
                 CONTROL_QUANTITY,
             </if>
+            <if test="saleMakeDate != null">
+                SALE_MAKE_DATE,
+            </if>
+            <if test="materialPlanNumber != null">
+                MATERIAL_PLAN_NUMBER,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saleMaterialId != null">
@@ -427,6 +456,12 @@
             <if test="controlQuantity != null">
                 #{controlQuantity,jdbcType=VARCHAR},
             </if>
+            <if test="saleMakeDate != null">
+                #{saleMakeDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="materialPlanNumber != null">
+                #{materialPlanNumber,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -452,7 +487,9 @@
             INVENTORY_STATUS = #{inventoryStatus,jdbcType=VARCHAR},
             TRANSFER_IN_PLAN_DATE = #{transferInPlanDate,jdbcType=TIMESTAMP},
             TRANSFER_OUT_PLAN_DATE = #{transferOutPlanDate,jdbcType=TIMESTAMP},
-            CONTROL_QUANTITY = #{controlQuantity,jdbcType=VARCHAR}
+            CONTROL_QUANTITY = #{controlQuantity,jdbcType=VARCHAR},
+            SALE_MAKE_DATE = #{saleMakeDate,jdbcType=TIMESTAMP},
+            MATERIAL_PLAN_NUMBER = #{materialPlanNumber,jdbcType=DECIMAL}
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -524,6 +561,12 @@
             <if test="controlQuantity != null">
                 CONTROL_QUANTITY = #{controlQuantity,jdbcType=VARCHAR},
             </if>
+            <if test="saleMakeDate != null">
+                SALE_MAKE_DATE = #{saleMakeDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="materialPlanNumber != null">
+                MATERIAL_PLAN_NUMBER = #{materialPlanNumber,jdbcType=DECIMAL},
+            </if>
         </set>
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
@@ -551,7 +594,8 @@
         METER_WEIGHT, TRANSFER_OUT_OF_WAREHOUSE,
         TRANSFER_IN_OF_WAREHOUSE, INVENTORY_TYPE,
         INVENTORY_STATUS, TRANSFER_IN_PLAN_DATE,
-        TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY
+        TRANSFER_OUT_PLAN_DATE, CONTROL_QUANTITY,
+        SALE_MAKE_DATE, MATERIAL_PLAN_NUMBER
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
@@ -565,7 +609,8 @@
         #{item.meterWeight,jdbcType=DECIMAL}, #{item.transferOutOfWarehouse,jdbcType=VARCHAR},
         #{item.transferInOfWarehouse,jdbcType=VARCHAR}, #{item.inventoryType,jdbcType=VARCHAR},
         #{item.inventoryStatus,jdbcType=VARCHAR}, #{item.transferInPlanDate,jdbcType=TIMESTAMP},
-        #{item.transferOutPlanDate,jdbcType=TIMESTAMP}, #{item.controlQuantity,jdbcType=VARCHAR}
+        #{item.transferOutPlanDate,jdbcType=TIMESTAMP}, #{item.controlQuantity,jdbcType=VARCHAR},
+        #{item.saleMakeDate,jdbcType=TIMESTAMP}, #{item.materialPlanNumber,jdbcType=DECIMAL}
         from dual
     </foreach> )
     </insert>
@@ -664,6 +709,14 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
             when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.controlQuantity,jdbcType=VARCHAR}
         </foreach>
+        ,SALE_MAKE_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.saleMakeDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,MATERIAL_PLAN_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.materialPlanNumber,jdbcType=DECIMAL}
+        </foreach>
         where SALE_MATERIAL_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.saleMaterialId,jdbcType=DECIMAL}
@@ -678,6 +731,10 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 通过物资编码查询物资id -->
     <select id="getMaterialId" parameterType="java.lang.String" resultType="DECIMAL">
         SELECT RM.MATERIAL_ID AS "materialId"