根据库位查询物品

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/dao/StockInfoMapper.java

@@ -46,6 +46,8 @@ public interface StockInfoMapper extends SuperMapper<StockInfo> {
 
     List<StockInfo>getListByGoodsId(Map map);
 
+    List<StockInfo>getGoodsListBystorgeId(Map map);
+
     /**
      *
      * @param queryMap

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/StockInfoService.java

@@ -70,6 +70,10 @@ public interface StockInfoService extends SuperService<StockInfo> {
      * @return
      */
     List<Map> getGoodsList();
+
+
+    List<Map> getGoodsListBystorgeId(Map map);
+
     /**
      * 解锁/锁定状态
      */

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StockInfoServiceImpl.java

@@ -308,6 +308,12 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
     public List<Map> getGoodsList(){
         return baseMapper.getGoodsList();
     }
+
+    @Override
+    public List<Map> getGoodsListBystorgeId(Map map) {
+        return baseMapper.getGoodsListBystorgeId(map);
+    }
+
     @Override
     public StockInfo updateLocking(StockInfoUpdateDTO model){
         StockInfo stockInfo = BeanPlusUtil.toBean(model, StockInfo.class);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -68,6 +68,15 @@
         </if>
     </select>
 
+    <select id="getGoodsListBystorgeId" resultMap="BaseResultMap" parameterType="map">
+        select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum from imcs_s_stock_info a
+        left join view_stock_goods b on a.goods_id  = b.id
+        where 1=1
+        <if test="storgeId != null and storgeId != ''">
+            and a.storge_id = #{storgeId} and b.id is not null
+        </if>
+    </select>
+
     <!-- 统计货架里数量 -->
     <select id="getStockCountByShelves"  resultType="map">
         SELECT

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/edgeLibrary/StockInfoController.java

@@ -118,6 +118,14 @@ public class StockInfoController extends SuperController<StockInfoService, Long,
     }
 
 
+    @ApiOperation(value = "根据库位查询物品信息", notes = "根据库位查询物品信息")
+    @PostMapping("/getGoodsListBystorgeId")
+    public R<List<Map>> getGoodsListBystorgeId(@RequestBody Map map) {
+
+        return success(baseService.getGoodsListBystorgeId(map));
+    }
+
+
     @ApiOperation(value = "解锁/锁定状态", notes = "解锁/锁定状态")
     @PostMapping("/updateLocking")
     public R<StockInfo>updateLocking(@RequestBody StockInfoUpdateDTO model) {

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

@@ -218,6 +218,11 @@ public class BBom extends Entity<Long> {
     private String version;
 
 
+    @ApiModelProperty(value = "说明")
+    @TableField("remark")
+    private String  remark;
+
+
 
     @Builder
     public BBom(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 

imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -122,6 +122,7 @@
         )a on v.id = a.resource_id
         LEFT JOIN (select resource_id,count(1) positionCount from imcs_p_productionresource_position p group by p.resource_id)b
         on v.id = b.resource_id
+        left JOIN imcs_p_productionresource_conf c on v.id = c.resource_id
         <if test="gatherSql != null">
             left join ${gatherSql} g on g.resource_id = v.id
         </if>