入库websocket同步物料信息

smart-rack-base-admin/src/main/java/com/zehong/web/controller/shelf/TShelfStorageLocationController.java

@@ -111,11 +111,7 @@ public class TShelfStorageLocationController extends BaseController
      */
     @PostMapping("/rackInOutput")
     public AjaxResult rackInOutput(@RequestBody String param) {
-        String result = shelfApiService.rackInOutput(param);
-        JSONObject resultJson = JSONObject.parseObject(result);
-        if("1".equals(resultJson.getString("FLAG"))) {
-            return AjaxResult.error(resultJson.getString("MESSAGE"));
-        }
+        shelfApiService.rackInOutput(param);
         return AjaxResult.success();
     }
 

smart-rack-base-system/src/main/java/com/zehong/system/mapper/material/TRackMaterialRelationMapper.java

@@ -19,6 +19,13 @@ public interface TRackMaterialRelationMapper
      */
     public TRackMaterialRelation selectTRackMaterialRelationById(Long relationId);
 
+    /**
+     * 查询料架和物料维护
+     * @param rackCode 料架号
+     * @return 料架和物料维护
+     */
+    TRackMaterialRelation selectTRackMaterialRelationByRackCode(String rackCode);
+
     /**
      * 查询料架和物料维护列表
      * 

smart-rack-base-system/src/main/java/com/zehong/system/service/impl/shelf/ITShelfApiServiceImpl.java

@@ -83,7 +83,7 @@ public class ITShelfApiServiceImpl implements ITShelfApiService{
     @Override
     @Transactional(rollbackFor = Exception.class)
     @PlatformDockingTaskLog(type = DockingTaskType.CALL_RACK_SYSTEM)
-    public String rackInOutput(String param){
+    public void rackInOutput(String param){
         log.info("rackInOutput...param==========" + param);
         JSONObject paramJson = JSONObject.parseObject(param);
         if(paramJson.containsKey("relationParam")){
@@ -91,13 +91,15 @@ public class ITShelfApiServiceImpl implements ITShelfApiService{
             addRelationInfo(paramJson.getJSONObject("relationParam"));
             String result = HttpClientUtils.doPost(shelfApiUrl + RACK_IN_OUT_PUT_URL,paramJson.getString("inStoreParam"),null);
             if(StringUtils.isEmpty(result)) throw new CustomException("料架出入库接口错误");
-            return result;
+            JSONObject resultJson = JSONObject.parseObject(result);
+            if("1".equals(resultJson.getString("FLAG"))) throw new CustomException("料架入库失败" + resultJson.getString("MESSAGE"));
         }else{
             //出库
             delRelationInfo(JSONObject.parseObject(param));
             String result = HttpClientUtils.doPost(shelfApiUrl + RACK_IN_OUT_PUT_URL,param,null);
             if(StringUtils.isEmpty(result)) throw new CustomException("料架出入库接口错误");
-            return result;
+            JSONObject resultJson = JSONObject.parseObject(result);
+            if("1".equals(resultJson.getString("FLAG"))) throw new CustomException("料架出库失败" + resultJson.getString("MESSAGE"));
         }
     }
 
@@ -163,6 +165,11 @@ public class ITShelfApiServiceImpl implements ITShelfApiService{
             if("I".equals(request.getString("optype"))){
                 tShelfStorageLocation.setInboundTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(request.getString("operateDate")));
                 tShelfStorageLocation.setRid(request.getString("rid"));
+                //查询物料信息
+                TRackMaterialRelation materialInfo = rackMaterialRelationMapper.selectTRackMaterialRelationByRackCode(request.getString("rid"));
+                request.put("materialCode",materialInfo.getMaterialCode());
+                request.put("materialName",materialInfo.getMaterialName());
+                request.put("materialSpecifications",materialInfo.getMaterialSpecifications());
             }
             if("O".equals(request.getString("optype"))){
                 tShelfStorageLocation.setOutboundTime(new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(request.getString("operateDate")));

smart-rack-base-system/src/main/java/com/zehong/system/service/shelf/ITShelfApiService.java

@@ -20,7 +20,7 @@ public interface ITShelfApiService {
      * @param param
      * @return
      */
-    String rackInOutput(String param);
+    void rackInOutput(String param);
 
     /**
      *4 获取料架所有储位信息

smart-rack-base-system/src/main/resources/mapper/material/TRackMaterialRelationMapper.xml

@@ -48,6 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where relation.relation_id = #{relationId}
     </select>
 
+    <select id="selectTRackMaterialRelationByRackCode" parameterType="String" resultMap="TRackMaterialRelationResult">
+        <include refid="selectTRackMaterialRelationVo"/>
+        where relation.rack_code = #{rackCode}
+    </select>
+        
     <insert id="insertTRackMaterialRelation" parameterType="TRackMaterialRelation" useGeneratedKeys="true" keyProperty="relationId">
         insert into t_rack_material_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">

smart-rack-base-web/src/views/pcbamanage/pcbashelflocation/index.vue

@@ -310,6 +310,9 @@
             if("I" == message.optype){
               const locationInfo = this.shelfLayoutList.flat().find(location => location.location === message.location);
               locationInfo.rid = message.rid;
+              locationInfo.materialCode = message.materialCode;
+              locationInfo.materialName = message.materialName;
+              locationInfo.materialSpecifications = message.materialSpecifications;
             }
             //出库
             if("O" == message.optype){

smart-rack-base-web/src/views/producemange/produceshelflocation/index.vue

@@ -310,6 +310,9 @@
             if("I" == message.optype){
               const locationInfo = this.shelfLayoutList.flat().find(location => location.location === message.location);
               locationInfo.rid = message.rid;
+              locationInfo.materialCode = message.materialCode;
+              locationInfo.materialName = message.materialName;
+              locationInfo.materialSpecifications = message.materialSpecifications;
             }
             //出库
             if("O" == message.optype){