rev: 合并代码

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtStructattr.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -18,6 +19,7 @@ import java.util.Date;
  * @since 2023-05-04
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("st_ivt_structattr")
 public class StIvtStructattr implements Serializable {

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java

@@ -0,0 +1,112 @@
+package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 生产订单表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("mps_sale_order")
+public class MpsSaleOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 销售单标识
+     */
+    private Long sale_id;
+
+    /**
+     * 销售单号
+     */
+    private String sale_code;
+
+    /**
+     * 明细序号
+     */
+    private BigDecimal seq_no;
+
+    /**
+     * 销售单类型
+     */
+    private String sale_type;
+
+    /**
+     * 物料标识
+     */
+    private Long material_id;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 销售数量
+     */
+    private BigDecimal sale_qty;
+
+    /**
+     * 生产顺序
+     */
+    private BigDecimal produce_seq;
+
+    /**
+     * 客户标识
+     */
+    private Long cust_id;
+
+    /**
+     * 客户编码
+     */
+    private String cust_code;
+
+    /**
+     * 客户名称
+     */
+    private String cust_name;
+
+    /**
+     * 计量单位标识
+     */
+    private Long qty_unit_id;
+
+    /**
+     * 计划交期
+     */
+    private String plandeliver_date;
+
+    /**
+     * 创建人
+     */
+    private Long create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+    private String audit_optid;
+    private String audit_time;
+    private String audit_optname;
+    private String confirm_optid;
+    private String confirm_optname;
+    private String confirm_time;
+    private String is_delete;
+    private String remark;
+    private String workshop_id;
+    private String product_qty;
+    private String instor_qty;
+    private String sendout_qty;
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml

@@ -9,7 +9,7 @@
         FROM
             sch_cacheline_vehilematerial v
         LEFT JOIN sch_cacheline_position p ON p.vehicle_code = v.vehicle_code
-        WHERE p.vehicle_code <> '' and
+        WHERE p.vehicle_code != '' and
             v.vehicle_status = #{vehicle_status}
         <if test="material_id != null and material_id != ''">
             v.material_id = #{material_id}