'打开修改同步'

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

@@ -992,21 +992,21 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         //分页数据
         int result = amsSaleOrderService.updateAllMaterialInSale(mapValue);
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
-        // 调用金蝶接口，将销售订单推送到金蝶系统
-//        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
-//        Map<String, Object> head = (Map<String, Object>) input.get("head");
-//        head.put("status", "update");
-//        // 获得金蝶接口配置:正式
-////        Map<String, Object> totalMap = easUtil.getTotalMap();
-//        // 获得金蝶接口配置:测试
+//         调用金蝶接口，将销售订单推送到金蝶系统
+        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+        Map<String, Object> head = (Map<String, Object>) input.get("head");
+        head.put("status", "update");
+        // 获得金蝶接口配置:正式
 //        Map<String, Object> totalMap = easUtil.getTotalMap();
-//        // 组装报文
-//        totalMap.put("input", input);
-//        System.out.println(totalMap);
-//        String json = JSONUtils.toJSONString(totalMap);
-//        System.out.println(json);
-//        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
-//        System.out.println(resultMap);
+        // 获得金蝶接口配置:测试
+        Map<String, Object> totalMap = easUtil.getTotalMap();
+        // 组装报文
+        totalMap.put("input", input);
+        System.out.println(totalMap);
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
+        System.out.println(resultMap);
         return success(result);
     }
 

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

@@ -147,12 +147,6 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣）",required=false)
     private BigDecimal saleType;
 
-    /**
-     * 质保书份数(WARRANTY_NUMBER,DECIMAL,0)
-     */
-    @ApiModelProperty(value="质保书份数",required=false)
-    private BigDecimal warrantyNumber;
-
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -349,14 +343,6 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.saleType = saleType;
     }
 
-    public BigDecimal getWarrantyNumber() {
-        return warrantyNumber;
-    }
-
-    public void setWarrantyNumber(BigDecimal warrantyNumber) {
-        this.warrantyNumber = warrantyNumber;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -386,7 +372,6 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", closeStatus=").append(closeStatus);
         sb.append(", salerId=").append(salerId);
         sb.append(", saleType=").append(saleType);
-        sb.append(", warrantyNumber=").append(warrantyNumber);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -25,21 +25,20 @@
     <result column="CLOSE_STATUS" jdbcType="DECIMAL" property="closeStatus" />
     <result column="SALER_ID" jdbcType="DECIMAL" property="salerId" />
     <result column="SALE_TYPE" jdbcType="DECIMAL" property="saleType" />
-    <result column="WARRANTY_NUMBER" jdbcType="DECIMAL" property="warrantyNumber" />
   </resultMap>
   <sql id="columns">
     SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
-    SALER_ID, SALE_TYPE, WARRANTY_NUMBER
+    SALER_ID, SALE_TYPE
   </sql>
   <sql id="columns_alias">
     t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE,
     t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS,
     t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX,
     t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS, t.SALER_ID, t.SALE_TYPE, t.WARRANTY_NUMBER
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS, t.SALER_ID, t.SALE_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER
@@ -118,9 +117,6 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
-      <if test="warrantyNumber != null">
-        and WARRANTY_NUMBER = #{warrantyNumber}
-      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -194,9 +190,6 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
-      <if test="warrantyNumber != null">
-        and WARRANTY_NUMBER = #{warrantyNumber}
-      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -272,9 +265,6 @@
     <if test="saleType != null">
       or SALE_TYPE = #{saleType}
     </if>
-    <if test="warrantyNumber != null">
-      or WARRANTY_NUMBER = #{warrantyNumber}
-    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
@@ -285,8 +275,7 @@
                                 SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
                                 INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                 INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
-                                SALER_ID, SALE_TYPE, WARRANTY_NUMBER
-    )
+                                SALER_ID, SALE_TYPE)
     values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
             #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
             #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
@@ -295,8 +284,7 @@
             #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{closeStatus,jdbcType=DECIMAL},
-            #{salerId,jdbcType=DECIMAL}, #{saleType,jdbcType=DECIMAL}, #{warrantyNumber,jdbcType=DECIMAL}
-           )
+            #{salerId,jdbcType=DECIMAL}, #{saleType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER
@@ -370,9 +358,6 @@
       <if test="saleType != null">
         SALE_TYPE,
       </if>
-      <if test="warrantyNumber != null">
-        WARRANTY_NUMBER,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderId != null">
@@ -444,9 +429,6 @@
       <if test="saleType != null">
         #{saleType,jdbcType=DECIMAL},
       </if>
-      <if test="warrantyNumber != null">
-        #{warrantyNumber,jdbcType=DECIMAL},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -472,8 +454,7 @@
         DELETED = #{deleted,jdbcType=DECIMAL},
         CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL},
         SALER_ID = #{salerId,jdbcType=DECIMAL},
-        SALE_TYPE = #{saleType,jdbcType=DECIMAL},
-        WARRANTY_NUMBER = #{warrantyNumber,jdbcType=DECIMAL}
+        SALE_TYPE = #{saleType,jdbcType=DECIMAL}
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -545,9 +526,6 @@
       <if test="saleType != null">
         SALE_TYPE = #{saleType,jdbcType=DECIMAL},
       </if>
-      <if test="warrantyNumber != null">
-        WARRANTY_NUMBER = #{warrantyNumber,jdbcType=DECIMAL},
-      </if>
     </set>
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
@@ -575,7 +553,7 @@
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, CLOSE_STATUS, SALER_ID,
-    SALE_TYPE, WARRANTY_NUMBER)
+    SALE_TYPE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.saleOrderId,jdbcType=DECIMAL},
@@ -588,7 +566,7 @@
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.deleted,jdbcType=DECIMAL}, #{item.closeStatus,jdbcType=DECIMAL}, #{item.salerId,jdbcType=DECIMAL},
-    #{item.saleType,jdbcType=DECIMAL}, #{item.warrantyNumber,jdbcType=DECIMAL} from dual
+    #{item.saleType,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -686,10 +664,6 @@
     <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
       when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleType,jdbcType=DECIMAL}
     </foreach>
-    ,WARRANTY_NUMBER=
-    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.warrantyNumber,jdbcType=DECIMAL}
-    </foreach>
     where SALE_ORDER_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.saleOrderId,jdbcType=DECIMAL}
@@ -704,6 +678,7 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
       order by "${orderField}"