Преглед на файлове

机具表新增机具地址字段

mac преди 2 години
родител
ревизия
ea467b988c

+ 6 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachine.java

@@ -300,6 +300,12 @@ public class KxsMachine extends Model<KxsMachine> implements Serializable {
     @Schema(description = "溯源机具和兑换券")
     @Schema(description = "溯源机具和兑换券")
     private String sourcePosSn;
     private String sourcePosSn;
 
 
+    /**
+     * 机具地址
+     */
+    @Schema(description = "机具地址")
+    private String devLocation;
+
 
 
 }
 }
 
 

+ 1 - 0
kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -40,6 +40,7 @@
         <result column="debit_card_trade" property="debitCardTrade"/>
         <result column="debit_card_trade" property="debitCardTrade"/>
         <result column="scan_qr_trade" property="scanQrTrade"/>
         <result column="scan_qr_trade" property="scanQrTrade"/>
         <result column="source_pos_sn" property="sourcePosSn"/>
         <result column="source_pos_sn" property="sourcePosSn"/>
+        <result column="dev_location" property="devLocation"/>
     </resultMap>
     </resultMap>
     <select id="machineStoreList" resultType="com.kxs.product.api.vo.kxsapp.machine.MachineStoreListVO">
     <select id="machineStoreList" resultType="com.kxs.product.api.vo.kxsapp.machine.MachineStoreListVO">
         select create_time, pos_sn from kxs_machine
         select create_time, pos_sn from kxs_machine

+ 3 - 0
kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineServiceImpl.java

@@ -245,6 +245,9 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                 case "BatchNo":
                 case "BatchNo":
                     machine.setBatchNo(validFieldDataMap.get(field).toString());
                     machine.setBatchNo(validFieldDataMap.get(field).toString());
                     break;
                     break;
+                case "OutBatchNo":
+                    machine.setDevLocation(validFieldDataMap.get(field).toString());
+                    break;
                 case "CreateDate":
                 case "CreateDate":
                     machine.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     machine.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                     break;