Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/CurrTask.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -118,6 +118,12 @@ public class CurrTask extends Model<CurrTask> {
     @TableField("target_position")
     private String targetPosition;
 
+    /**
+     * 目标窑炉id
+     */
+    @TableField("kiln_id")
+    private Long kilnId;
+
     /**
      * 车辆id，关联车辆表：t_vehicle_info
      */
@@ -173,6 +179,8 @@ public class CurrTask extends Model<CurrTask> {
 
     public static final String TARGET_POSITION = "target_position";
 
+    public static final String KILN_ID = "kiln_id";
+
     public static final String VEHICLE_ID = "vehicle_id";
 
     public static final String IS_CACHE = "is_cache";

6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -70,6 +70,12 @@ public class OrderInfo extends Model<OrderInfo> {
     @Version
     private String version;
 
+    /**
+     * 来源：1.APMS  2.人工输入
+     */
+    @TableField("order_source")
+    private Integer orderSource;
+
     /**
      * 状态：	0等待执行，1执行中，2执行完成，3追加后完成（追加后就按完成来算）
      */
@@ -193,6 +199,8 @@ public class OrderInfo extends Model<OrderInfo> {
 
     public static final String VERSION = "version";
 
+    public static final String ORDER_SOURCE = "order_source";
+
     public static final String STATUS = "status";
 
     public static final String INTER_CODE = "inter_code";

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 public interface CurrTaskMapper extends BaseMapper<CurrTask> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/CurrTaskMapper.xml

@@ -19,6 +19,7 @@
         <result column="a_end_time" property="aEndTime" />
         <result column="start_position" property="startPosition" />
         <result column="target_position" property="targetPosition" />
+        <result column="kiln_id" property="kilnId" />
         <result column="vehicle_id" property="vehicleId" />
         <result column="is_cache" property="isCache" />
         <result column="location_id" property="locationId" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, pallet_code, a_begin_time, a_end_time, start_position, target_position, vehicle_id, is_cache, location_id, location_name
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, pallet_code, a_begin_time, a_end_time, start_position, target_position, kiln_id, vehicle_id, is_cache, location_id, location_name
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-08
  */
 public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/OrderInfoMapper.xml

@@ -11,6 +11,7 @@
         <result column="updater_id" property="updaterId" />
         <result column="update_time" property="updateTime" />
         <result column="version" property="version" />
+        <result column="order_source" property="orderSource" />
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
         <result column="code" property="code" />
@@ -33,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b
+        id, valid, create_time, creator_id, updater_id, update_time, version, order_source, status, inter_code, code, order_no, iden_card_num, customer_no, customer_name, product_name, product_model, material_des, craft_ill, unit, weight, quantity, add_a, add_b, orther_a, orther_b
     </sql>
 
 </mapper>

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/CurrTaskServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 public interface CurrTaskServiceBiz extends IService<CurrTask> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/OrderInfoServiceBiz.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-08
  */
 public interface OrderInfoServiceBiz extends IService<OrderInfo> {
 

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/CurrTaskServiceBizImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-09
  */
 @Service
 public class CurrTaskServiceBizImpl extends ServiceImpl<CurrTaskMapper, CurrTask> implements CurrTaskServiceBiz {

6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/OrderInfoServiceBizImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author mt
- * @since 2021-09-29
+ * @since 2021-11-08
  */
 @Service
 public class OrderInfoServiceBizImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements OrderInfoServiceBiz {