laoyao %!s(int64=3) %!d(string=hai) anos
pai
achega
8619445691

+ 1 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -113,6 +113,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         order.setSource("1");
         order.setOrderStatus("1");
         order.setStatus("1");
+        order.setOrderName(data.get("orderName").toString());
         order.setCustId(Long.parseLong(data.get("custId")==null?"0":data.get("custId").toString()));
         order.setDeliveryTime(DateUtil.stringToDate3(data.get("deliveryTime").toString()));
         order.setOrderTime(DateUtil.stringToDate3(data.get("orderTime").toString()));

+ 3 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderMapper.xml

@@ -26,12 +26,14 @@
         <result column="scheduling_status" jdbcType="VARCHAR" property="schedulingStatus"/>
         <result column="rhythm_type" jdbcType="VARCHAR" property="rhythmType"/>
         <result column="produce_status" jdbcType="VARCHAR" property="produceStatus"/>
+        <result column="order_name" jdbcType="VARCHAR" property="orderName"/>
+
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,update_time,
-        order_no, cust_id, source, order_status, audit_status, status, plan_status, order_time, delivery_time, remark, create_user, update_user, prority,produce_num,product_num,complete_num,process,
+        order_no, cust_id, source, order_status, audit_status, status, plan_status, order_time, delivery_time, remark, create_user, update_user, prority,produce_num,product_num,complete_num,process,order_name,
         scheduling_status, rhythm_type, produce_status,custDesc,zoenDesc,planBomNum,stayPlanNum,planNum
     </sql>
 

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderProductMapper.xml

@@ -57,7 +57,7 @@
 
     <select id="getList" parameterType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct" resultType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct">
         select a.*,b.name,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,
+        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,b.name bomName,
         (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime from imcs_o_order_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join (

+ 8 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Order.java

@@ -65,6 +65,14 @@ public class Order extends Entity<Long> {
     @Excel(name = "订单编号")
     private String orderNo;
 
+
+    @ApiModelProperty(value = "订单名称")
+    @NotEmpty(message = "订单名称不能为空")
+    @Length(max = 128, message = "订单名称长度不能超过128")
+    @TableField(value = "order_name", condition = LIKE)
+    @Excel(name = "订单名称")
+    private String orderName;
+
     /**
      * 客户ID
      */