托盘所在库位

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -512,8 +512,8 @@ public class TaskWorkNode {
                                         log.setRequestParam(jsonParam);
                                         log.setRequestUrl(instructionUrl);
                                         HttpEntity<String> formEntity = new HttpEntity<String>(jsonParam, headers);
-                                        returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
-                                        //returnData = "{\"result\": \"true\"}";
+                                        //returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
+                                        returnData = "{\"result\": \"true\"}";
 
 
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/TrayMapper.xml

@@ -18,12 +18,13 @@
         <result column="specification" jdbcType="VARCHAR" property="specification"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
         <result column="zone_id" jdbcType="BIGINT" property="zoneId"/>
+        <result column="storge_name" jdbcType="BIGINT" property="storgeName"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,material_type,factory,period,expiry_date,join_date,
-        name, no, zone_id, num, specification,production_type,category_type,five_axis,height_limit,status,positionSort,org_id
+        name, no, zone_id, num, specification,production_type,category_type,five_axis,height_limit,status,positionSort,org_id,storge_name
     </sql>
 
     <!-- 分页 -->
@@ -31,13 +32,15 @@
     select
     <include refid="Base_Column_List"/>
     from (
-        SELECT a.*, b.positionSort,z.org_id
+        SELECT a.*, b.positionSort,z.org_id,ss.name as storge_name
         FROM
              imcs_t_tray a
              LEFT JOIN (
                  SELECT tray_id,GROUP_CONCAT(position_sort) as positionSort
                  FROM imcs_t_tray_position GROUP BY tray_id) b ON a.id = b.tray_id
                  LEFT JOIN imcs_z_zone z ON z.id = a.zone_id
+        left join imcs_s_stock_info ssi on a.id=ssi.goods_id
+        left join imcs_s_storge ss on ssi.storge_id=ss.id
       ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Tray.java

@@ -176,6 +176,10 @@ public class Tray extends Entity<Long> {
     @TableField(exist = false)
     private String positionSort;
 
+    @ApiModelProperty(value = "托盘所在库位")
+    @TableField(exist = false)
+    private String storgeName;
+
     @TableField(exist = false)
     private List<TrayPosition> positionList;