Merge remote-tracking branch 'origin/master_liaozeyong'

src/main/java/com/jsh/erp/controller/UserController.java

@@ -536,17 +536,7 @@ public class UserController extends BaseController {
             User user = userService.getUser(userId);
             //获取当前用户数
             int userCurrentNum = userService.getUser(request).size();
-            Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
-            if(tenant.getExpireTime()!=null && tenant.getExpireTime().getTime()<System.currentTimeMillis()){
-                //租户已经过期，移除token
-                redisService.deleteObjectBySession(request,"userId");
-                redisService.deleteObjectBySession(request,"clientIp");
-            }
-            data.put("type", tenant.getType()); //租户类型，0免费租户，1付费租户
-            data.put("expireTime", Tools.parseDateToStr(tenant.getExpireTime()));
             data.put("userCurrentNum", userCurrentNum);
-            data.put("userNumLimit", tenant.getUserNumLimit());
-            data.put("tenantId", tenant.getTenantId());
             res.code = 200;
             res.data = data;
         } catch (Exception e) {

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -5,7 +5,6 @@ import com.jsh.erp.base.AjaxResult;
 import com.jsh.erp.base.BaseController;
 import com.jsh.erp.base.TableDataInfo;
 import com.jsh.erp.datasource.entities.DepotHead;
-import com.jsh.erp.datasource.entities.DepotItem;
 import com.jsh.erp.datasource.entities.Supplier;
 import com.jsh.erp.datasource.pda.dto.PDADepotHeadDTO;
 import com.jsh.erp.datasource.pda.vo.PDADepotHeadVO;
@@ -74,13 +73,31 @@ public class PdaController extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiModelProperty("订单开始处理")
+    @ApiOperation("订单开始处理")
     @GetMapping("/orderStartHandle/{id}")
     public AjaxResult orderStartHandle(@PathVariable("id") Long id) {
         depotHeadService.update(new UpdateWrapper<DepotHead>().set("status", "4").eq("id", id));
         return AjaxResult.success();
     }
 
+    @ApiOperation("商品详情")
+    @GetMapping("/materialDetail/{id}")
+    public AjaxResult materialDetail(@PathVariable("id") Long id) {
+        return AjaxResult.success(depotItemService.pdaDetail(id));
+    }
 
+    @ApiOperation("商品库存详情")
+    @GetMapping("/materialDepotDetail/{type}/{materialId}")
+    public TableDataInfo materialDepotDetail(@PathVariable("type") String type, @PathVariable("materialId") Long materialId) {
+        startPage();
+        List<PDADepotItemVO> list = depotItemService.materialDepotDetail(type , materialId);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("用于返回字段说明")
+    @GetMapping("test")
+    public AjaxResult test(PDADepotItemVO pdaDepotItemVO) {
+        return AjaxResult.success();
+    }
 
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java

@@ -12,11 +12,25 @@ public interface DepotItemMapper  extends BaseMapperX<DepotItem>{
 
     /**
      * 根据单据ID获取单据详情
-     * @param id
+     * @param id 订单ID
      * @return
      */
     List<PDADepotItemVO> pdaList(@Param("id") Long id);
 
+    /**
+     * 根据商品订单ID获取单据详情
+     * @param id 商品订单ID
+     * @return
+     */
+    PDADepotItemVO pdaDetail(@Param("id") Long id);
+
+    /**
+     * pda根据商品订单ID查询商品详情
+     * @param materialId 商品ID
+     * @return
+     */
+    List<PDADepotItemVO> materialDepotDetail(@Param("type")String type , @Param("materialId") Long materialId);
+
     long countByExample(DepotItemExample example);
 
     int deleteByExample(DepotItemExample example);

src/main/java/com/jsh/erp/datasource/pda/vo/PDADepotItemVO.java

@@ -11,6 +11,12 @@ import java.util.Date;
 @Accessors
 public class PDADepotItemVO{
 
+    @ApiModelProperty("商品订单ID")
+    private Long id;
+
+    @ApiModelProperty("商品ID")
+    private Long materialId;
+
     @ApiModelProperty("商品名称")
     private String materialName;
 
@@ -40,4 +46,16 @@ public class PDADepotItemVO{
 
     @ApiModelProperty("商品单位")
     private String materialUnit;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("商品系统SKU")
+    private String systemId;
+
+    @ApiModelProperty("仓库名称")
+    private String depotName;
+
+    @ApiModelProperty("实际出入库数量")
+    private String actualQuantityInStorage;
 }

src/main/java/com/jsh/erp/service/DepotItemService.java

@@ -25,6 +25,20 @@ public interface DepotItemService extends IService<DepotItem> {
      */
     List<PDADepotItemVO> pdaList(Long id);
 
+    /**
+     * pda根据商品订单ID查询商品详情
+     * @param id 商品订单ID
+     * @return
+     */
+    PDADepotItemVO pdaDetail(Long id);
+
+    /**
+     * 商品库存详情列表
+     * @param materialId 商品ID
+     * @return
+     */
+    List<PDADepotItemVO> materialDepotDetail(String type, Long materialId);
+
     DepotItem getDepotItem(long id)throws Exception;
 
     List<DepotItem> getDepotItem()throws Exception;

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -81,6 +81,26 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
         return depotItemMapper.pdaList(id);
     }
 
+    /**
+     * pda根据商品订单ID查询商品详情
+     * @param id 商品订单ID
+     * @return
+     */
+    @Override
+    public PDADepotItemVO pdaDetail(Long id) {
+        return depotItemMapper.pdaDetail(id);
+    }
+
+    /**
+     * 商品库存详情列表
+     * @param materialId 商品ID
+     * @return
+     */
+    @Override
+    public List<PDADepotItemVO> materialDepotDetail(String type , Long materialId) {
+        return depotItemMapper.materialDepotDetail(type , materialId);
+    }
+
     @Override
     public DepotItem getDepotItem(long id)throws Exception {
         DepotItem result=null;

src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -566,6 +566,7 @@
 
   <select id="pdaList" resultType="com.jsh.erp.datasource.pda.vo.PDADepotItemVO">
     SELECT
+      di.id AS id,
       m.`name` AS material_name,
       m.standard AS material_standard,
       me.batch_number AS batch_number,
@@ -584,4 +585,51 @@
       di.delete_flag = '0'
       AND di.header_id = #{id}
   </select>
+
+  <select id="pdaDetail" resultType="com.jsh.erp.datasource.pda.vo.PDADepotItemVO">
+    SELECT
+      di.id AS id,
+      m.`name` AS material_name,
+      m.standard AS material_standard,
+      me.batch_number AS batch_number,
+      me.production_date AS production_date,
+      me.position AS position,
+	  me.inventory AS inventory,
+	  me.bar_code AS bar_code,
+	  di.oper_number AS oper_number,
+
+      di.material_unit AS material_unit,
+      me.create_time AS create_time
+    FROM
+      jsh_depot_item di
+      LEFT JOIN jsh_material m ON di.material_id = m.id
+      LEFT JOIN jsh_material_extend me ON di.material_extend_id = me.id
+    WHERE
+      di.delete_flag = '0'
+      AND di.id = #{id}
+  </select>
+
+  <select id="materialDepotDetail" resultType="com.jsh.erp.datasource.pda.vo.PDADepotItemVO">
+    SELECT
+      di.id AS id,
+      di.material_id AS material_id,
+      m.`name` AS material_name,
+      d.name AS depot_name,
+      m.standard AS material_standard,
+      di.actual_quantity_in_storage AS actual_quantity_in_storage,
+      di.warehousing_time AS warehousing_time,
+      me.commodity_unit AS commodity_unit
+    FROM
+      jsh_depot_item di
+      LEFT JOIN jsh_material m ON di.material_id = m.id
+      LEFT JOIN jsh_material_extend me ON di.material_extend_id = me.id
+      LEFT JOIN jsh_depot d ON di.depot_id = d.id
+    WHERE
+      di.delete_flag = '0'
+      AND m.status in ('2','3')
+      AND di.type = #{type}
+      AND di.material_id = #{materialId}
+  </select>
+
+
 </mapper>