'采购订单'

pom.xml

@@ -194,7 +194,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>RMS_CONSIGNEE</table>
+                        <table>AMS_PURCHASE_ORDER</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -129,6 +129,18 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="供应商屏蔽信息",required=false)
     private String supplierScreenInfo;
 
+    /**
+     * 质检项目和质检标准集合(QIITEM,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="质检项目和质检标准集合",required=false)
+    private String qiitem;
+
+    /**
+     * 资源点(RESOURCE_POINT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="资源点",required=false)
+    private String resourcePoint;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -301,6 +313,22 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
         this.supplierScreenInfo = supplierScreenInfo == null ? null : supplierScreenInfo.trim();
     }
 
+    public String getQiitem() {
+        return qiitem;
+    }
+
+    public void setQiitem(String qiitem) {
+        this.qiitem = qiitem == null ? null : qiitem.trim();
+    }
+
+    public String getResourcePoint() {
+        return resourcePoint;
+    }
+
+    public void setResourcePoint(String resourcePoint) {
+        this.resourcePoint = resourcePoint == null ? null : resourcePoint.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -327,6 +355,8 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
         sb.append(", easEntryId=").append(easEntryId);
         sb.append(", isMoreTrips=").append(isMoreTrips);
         sb.append(", supplierScreenInfo=").append(supplierScreenInfo);
+        sb.append(", qiitem=").append(qiitem);
+        sb.append(", resourcePoint=").append(resourcePoint);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -63,6 +63,10 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         Object plantAreaNum = mapVal.get("plantAreaNum");
         // 得到供应商屏蔽信息
         Object supplierScreenInfo = mapVal.get("supplierScreenInfo");
+        // 质检项目和质检标准集合
+        String qiitem = (String) mapVal.get("QIITEM");
+        // 资源点
+        String resourcePoint = (String) mapVal.get("resourcePoint");
         Map<String, Object> map = new HashMap<>();
         map.put("materialCode", materialCode);
         BigDecimal materialId = amsPurchaseOrderMapper.getMaterialId(materialCode);
@@ -110,6 +114,8 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
         amsPurchaseOrder.setSupplierUnitId(supplierId);
         amsPurchaseOrder.setReceiveUnitId(purchasingOrganizationId);
+        amsPurchaseOrder.setQiitem(qiitem);
+        amsPurchaseOrder.setResourcePoint(resourcePoint);
         if (plantAreaNum != null) {
             if (plantAreaNum.toString().equals("001")) {
                 purchasingOrganizationId = new BigDecimal(1);

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

@@ -215,8 +215,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
                     // 得到金蝶分录主键
                     String easPrimaryId = (String) materialMap.get("easPrimaryId");
-                    // 得到物资数量
-                    String materialNumber = (String) materialMap.get("materialNumber");
+                    // 得到物资重量
+                    String materialWeight = (String) materialMap.get("materialNumber");
+                    // 得到物资件数
+                    String materialNumber = (String) materialMap.get("assistQty");
                     // 得到计量单位
                     String materialUnit = (String) materialMap.get("materialUnit");
                     amsSaleMaterial.setEasPrimaryId(easPrimaryId);
@@ -225,11 +227,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setInsertUsername("金蝶");
                     amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
-                    if (materialUnit.equals("件")) {
-                        amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
-                    } else {
-                        amsSaleMaterial.setMaterialWeight(new BigDecimal(materialNumber));
-                    }
+                    amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
+                    amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
                     result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
                 }
                 result += amsSaleOrderMapper.insertSelective(amsSaleOrder);
@@ -262,8 +261,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     Map<String,Object> resultMap = new HashMap<>();
                     resultMap.put("easPrimaryId",easPrimaryId);
                     AmsSaleMaterial amsSaleMaterial;
-                    // 得到物资数量
-                    String materialNumber = (String) materialMap.get("materialNumber");
+                    // 得到物资重量
+                    String materialWeight = (String) materialMap.get("materialNumber");
+                    // 得到物资件数
+                    String materialNumber = (String) materialMap.get("assistQty");
                     // 如果有物流系统销售订单物资表主键：认定是走物流新增的销售订单（通过物流系统主键进行查询）
                     if (saleMaterialId != null && (!saleMaterialId.equals("null")) && !saleMaterialId.equals("")) {
                         amsSaleMaterial = amsSaleMaterialMapper.selectByPrimaryKey(new BigDecimal(saleMaterialId));
@@ -295,11 +296,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     String materialCode = (String) materialMap.get("materialCode");
                     // 得到计量单位
                     String materialUnit = (String) materialMap.get("materialUnit");
-                    if (materialUnit.equals("件")) {
-                        amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
-                    } else {
-                        amsSaleMaterial.setMaterialWeight(new BigDecimal(materialNumber));
-                    }
+                    amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
+                    amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
                     amsSaleMaterial.setEasPrimaryId(easPrimaryId);
                     amsSaleMaterial.setSaleOrderId(amsSaleOrder.getSaleOrderId());

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

@@ -22,20 +22,22 @@
     <result column="EAS_ENTRY_ID" jdbcType="VARCHAR" property="easEntryId" />
     <result column="IS_MORE_TRIPS" jdbcType="DECIMAL" property="isMoreTrips" />
     <result column="SUPPLIER_SCREEN_INFO" jdbcType="VARCHAR" property="supplierScreenInfo" />
+    <result column="QIITEM" jdbcType="VARCHAR" property="qiitem" />
+    <result column="RESOURCE_POINT" jdbcType="VARCHAR" property="resourcePoint" />
   </resultMap>
   <sql id="columns">
     PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
     PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER,
     RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID,
-    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
+    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO, QIITEM, RESOURCE_POINT
   </sql>
   <sql id="columns_alias">
     t.PURCHASE_ORDER_ID, t.PURCHASE_ORDER_NO, t.BATCH_ID, t.PURCHASE_ORDER_DATE, t.SUPPLIER_UNIT_ID,
     t.PURCHASING_ORGANIZATION_ID, t.PURCHASE_ORDER_BUYER, t.PUCHASE_ORDER_MATERIAL_NUMBER,
     t.RECEIVE_UNIT_ID, t.PUCHASE_ORDER_DELIVERY_DATE, t.INSERT_USERNAME, t.INSERT_TIME,
     t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_PURCHASE_ORDER_ID,
-    t.EAS_ENTRY_ID, t.IS_MORE_TRIPS, t.SUPPLIER_SCREEN_INFO
+    t.EAS_ENTRY_ID, t.IS_MORE_TRIPS, t.SUPPLIER_SCREEN_INFO, t.QIITEM, t.RESOURCE_POINT
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_PURCHASE_ORDER
@@ -105,6 +107,12 @@
       <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
         and SUPPLIER_SCREEN_INFO = #{supplierScreenInfo}
       </if>
+      <if test="qiitem != null and qiitem != ''">
+        and QIITEM = #{qiitem}
+      </if>
+      <if test="resourcePoint != null and resourcePoint != ''">
+        and RESOURCE_POINT = #{resourcePoint}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -169,9 +177,15 @@
       <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
         and SUPPLIER_SCREEN_INFO LIKE '%${supplierScreenInfo}%'
       </if>
+      <if test="qiitem != null and qiitem != ''">
+        and QIITEM LIKE '%${qiitem}%'
+      </if>
+      <if test="resourcePoint != null and resourcePoint != ''">
+        and RESOURCE_POINT LIKE '%${resourcePoint}%'
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from AMS_PURCHASE_ORDER
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </delete>
@@ -235,6 +249,12 @@
     <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
       or SUPPLIER_SCREEN_INFO = #{supplierScreenInfo}
     </if>
+    <if test="qiitem != null and qiitem != ''">
+      or QIITEM = #{qiitem}
+    </if>
+    <if test="resourcePoint != null and resourcePoint != ''">
+      or RESOURCE_POINT = #{resourcePoint}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
     insert into AMS_PURCHASE_ORDER (PURCHASE_ORDER_ID, PURCHASE_ORDER_NO,
@@ -244,8 +264,8 @@
                                     PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME,
                                     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                     INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID,
-                                    EAS_ENTRY_ID, IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
-    )
+                                    EAS_ENTRY_ID, IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO,
+                                    QIITEM, RESOURCE_POINT)
     values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR},
             #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP}, #{supplierUnitId,jdbcType=DECIMAL},
             #{purchasingOrganizationId,jdbcType=DECIMAL}, #{purchaseOrderBuyer,jdbcType=VARCHAR},
@@ -253,8 +273,8 @@
             #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easPurchaseOrderId,jdbcType=VARCHAR},
-            #{easEntryId,jdbcType=VARCHAR}, #{isMoreTrips,jdbcType=DECIMAL}, #{supplierScreenInfo,jdbcType=VARCHAR}
-           )
+            #{easEntryId,jdbcType=VARCHAR}, #{isMoreTrips,jdbcType=DECIMAL}, #{supplierScreenInfo,jdbcType=VARCHAR},
+            #{qiitem,jdbcType=VARCHAR}, #{resourcePoint,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
     insert into AMS_PURCHASE_ORDER
@@ -319,6 +339,12 @@
       <if test="supplierScreenInfo != null">
         SUPPLIER_SCREEN_INFO,
       </if>
+      <if test="qiitem != null">
+        QIITEM,
+      </if>
+      <if test="resourcePoint != null">
+        RESOURCE_POINT,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="purchaseOrderId != null">
@@ -381,6 +407,12 @@
       <if test="supplierScreenInfo != null">
         #{supplierScreenInfo,jdbcType=VARCHAR},
       </if>
+      <if test="qiitem != null">
+        #{qiitem,jdbcType=VARCHAR},
+      </if>
+      <if test="resourcePoint != null">
+        #{resourcePoint,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -403,7 +435,9 @@
         EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR},
         EAS_ENTRY_ID = #{easEntryId,jdbcType=VARCHAR},
         IS_MORE_TRIPS = #{isMoreTrips,jdbcType=DECIMAL},
-        SUPPLIER_SCREEN_INFO = #{supplierScreenInfo,jdbcType=VARCHAR}
+        SUPPLIER_SCREEN_INFO = #{supplierScreenInfo,jdbcType=VARCHAR},
+        QIITEM = #{qiitem,jdbcType=VARCHAR},
+        RESOURCE_POINT = #{resourcePoint,jdbcType=VARCHAR}
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -466,10 +500,16 @@
       <if test="supplierScreenInfo != null">
         SUPPLIER_SCREEN_INFO = #{supplierScreenInfo,jdbcType=VARCHAR},
       </if>
+      <if test="qiitem != null">
+        QIITEM = #{qiitem,jdbcType=VARCHAR},
+      </if>
+      <if test="resourcePoint != null">
+        RESOURCE_POINT = #{resourcePoint,jdbcType=VARCHAR},
+      </if>
     </set>
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </select>
@@ -492,8 +532,8 @@
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, DELETED,
     EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID,
-    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
-    )
+    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO,
+    QIITEM, RESOURCE_POINT)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.purchaseOrderId,jdbcType=DECIMAL},
@@ -505,8 +545,8 @@
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
     #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
     #{item.easPurchaseOrderId,jdbcType=VARCHAR}, #{item.easEntryId,jdbcType=VARCHAR},
-    #{item.isMoreTrips,jdbcType=DECIMAL}, #{item.supplierScreenInfo,jdbcType=VARCHAR}
-    from dual
+    #{item.isMoreTrips,jdbcType=DECIMAL}, #{item.supplierScreenInfo,jdbcType=VARCHAR},
+    #{item.qiitem,jdbcType=VARCHAR}, #{item.resourcePoint,jdbcType=VARCHAR} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -592,6 +632,14 @@
     <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
       when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierScreenInfo,jdbcType=VARCHAR}
     </foreach>
+    ,QIITEM=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.qiitem,jdbcType=VARCHAR}
+    </foreach>
+    ,RESOURCE_POINT=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.resourcePoint,jdbcType=VARCHAR}
+    </foreach>
     where PURCHASE_ORDER_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.purchaseOrderId,jdbcType=DECIMAL}