部门和角色

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -1,8 +1,6 @@
 package com.platform.rest.controller.yongyou;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.HttpUtil;
 import com.platform.common.util.JsonUtils;
@@ -28,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * @Description 备件领用登记单 控制器
@@ -96,12 +93,30 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList(spareStoreDTO, pageNum, pageSize));
     }
 
+    /**
+     * 获取测试请购物料数据
+     * @param spareStoreDTO 备件查询条件DTO
+     * @param pageNum       当前页码
+     * @param pageSize      每页条数
+     * @return R
+     */
+    @GetMapping("/spareStore/page/test")
+    public R<AbstractPageResultBean<SpareStoreVO>> querySpareStoreTest(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(yongyouService.selectPageListTest(spareStoreDTO, pageNum, pageSize));
+    }
     @GetMapping("/spareStore/page2")
     public R<AbstractPageResultBean<SpareStoreVO>> querySpareStore2(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R<>(yongyouService.selectPageList2(spareStoreDTO, pageNum, pageSize));
     }
 
 
+    /**
+     * 同步请购单状态
+     * @param detailDTO
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @GetMapping("/purchaseOrder/list")
     public R<AbstractPageResultBean<LongYanPurchaseDetailListVO>> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R(yongyouService.getLongYanPurchaseDetailListVOs(detailDTO, pageNum, pageSize));
@@ -136,7 +151,6 @@ public class YongyouController {
     @SysLog("向用友推送采购单")
     @GetMapping("/push/purchaseOrder/{id}")
     public R pushPurchaseOrder(@PathVariable String id) {
-//        yongyouService.addOutForm(id, false);
         return new R(yongyouService.pushPurchaseOrder(id));
     }
 

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -818,8 +818,8 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
     @Override
     public void handleCallRepair(RepairApplicationFormDTO model) {
         RepairApplicationForm queryForm = repairApplicationFormMapper.selectById(model.getId());
-        if(queryForm == null){
-            throw new DeniedException("审核的报修单不存在");
+        if(queryForm == null || queryForm.getStatus() != RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){
+            throw new DeniedException("审核的报修单不存在或已审核");
         }
         RepairApplicationForm updForm = new RepairApplicationForm();
         updForm.setId(model.getId());
@@ -832,6 +832,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             throw new DeniedException("提交状态值非法");
         }
         updForm.setVerifyRepairRemark(model.getVerifyRepairRemark());
+        repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
         // 给生产工程师和区域负责人发信息
         List<SysUserVO> sysUserVOList = getRepairMangers(queryForm.getRepairDeptId(),null,SysRoleCodeEnum.REPAIR_MANAGE.name());
         if(sysUserVOList == null || sysUserVOList.size() ==0){
@@ -853,7 +854,6 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 mmScb.add(item);
             });
         }
-        repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
         addRepairStatusRecord(updForm,"报修审核");
         sendMessageToRepairManger(queryForm,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
         // 给值班人员发送消息

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -10,6 +10,7 @@ import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import handler.yongyou.response.LongYanPurchaseDetailListVO;
 import handler.yongyou.response.OtherOutAddResponse;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @Description 用友service
@@ -35,6 +36,8 @@ public interface YongyouService {
      */
     AbstractPageResultBean<SparePartInfoVO> selectPageList(SparePartInfoDTO record, int pageNum, int pageSize);
 
+    AbstractPageResultBean<SpareStoreVO> selectPageListTest(SpareStoreDTO spareStoreDTO, int pageNum, int pageSize);
+
     /**
      * 分页查询备件库存
      *

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -132,6 +132,13 @@ public class YongyouServiceImpl implements YongyouService {
         return token;
     }
 
+    private String geTokenTest() {
+        // 本地测试
+        String token = RedisUtils.getString(token_key_dev);
+        token = StringUtils.isBlank(token) ? geTokenForceTest() : token;
+        return token;
+    }
+
     /**
      * 强制重新获取token
      *
@@ -203,6 +210,29 @@ public class YongyouServiceImpl implements YongyouService {
         return token;
     }
 
+    private String geTokenForceTest() {
+        LoginHandler handler = new LoginHandler();
+        LoginRequest req = new LoginRequest();
+        req.setCSrv("192.168.16.249");
+        req.setPUserId("sb");
+        req.setPPassword("321.jkl");
+        req.setPAccId("993");
+        req.setPDate(DateUtils.dateToString(LocalDate.now(), DateUtils.PATTERN_YMD));
+        req.setPSubId("DP");
+        handler.setRequest(req);
+        String responseStr = handler.handler();
+        LoginResponse response = JSONObject.parseObject(responseStr, LoginResponse.class);
+        if (!response.getResult()) {
+            throw new BusinessException(response.getMsg() + "," + response.getData().getMsg());
+        }
+        Login login = response.getData();
+        String token = login.getToken();
+        RedisUtils.setString(token_key_dev, token, 1800);
+        RedisUtils.setString(Conn_key_dev, login.getConn(), 1800);
+        RedisUtils.setString(cAcc_ID_key_dev, login.getCAcc_ID(), 1800);
+        return token;
+    }
+
     private String getConn() {
         return RedisUtils.getString(Conn_key);
     }
@@ -220,6 +250,10 @@ public class YongyouServiceImpl implements YongyouService {
         return null;
     }
 
+    private String getConnTest() {
+        return RedisUtils.getString(Conn_key_dev);
+    }
+
     private String getCAccId2(Integer type) {
         Boolean isDev = BeanUtils.isDev();
         if(!isDev) {
@@ -234,6 +268,10 @@ public class YongyouServiceImpl implements YongyouService {
         return null;
     }
 
+    private String getCAccIdTest() {
+        return RedisUtils.getString(cAcc_ID_key_dev);
+    }
+
     private String getCAccId() {
         return RedisUtils.getString(cAcc_ID_key);
     }
@@ -258,7 +296,6 @@ public class YongyouServiceImpl implements YongyouService {
         }else if (record.getTokenType()==2){
             req.setCAcc_ID("004");
         }
-//        req.setCAcc_ID(getCAccId());
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
         StringBuffer whereStr = new StringBuffer(" 1=1 ");
@@ -369,7 +406,6 @@ public class YongyouServiceImpl implements YongyouService {
         }else if (record.getTokenType()==2){
             req.setCAcc_ID("004");
         }
-//        req.setCAcc_ID(getCAccId());
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
         StringBuffer whereStr = new StringBuffer(" 1=1 ");
@@ -496,9 +532,16 @@ public class YongyouServiceImpl implements YongyouService {
     @Override
     public AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize) {
         GetLongYanPurchaseDetalListRequest request = new GetLongYanPurchaseDetalListRequest();
-        request.setToken(geToken(detailDTO.getOldOrNew()));
+        // 正式环境代码开始
+       /* request.setToken(geToken(detailDTO.getOldOrNew()));
         request.setCAcc_ID(getCAccId2(detailDTO.getOldOrNew()));
-        request.setConn(getConn2(detailDTO.getOldOrNew()));
+        request.setConn(getConn2(detailDTO.getOldOrNew()));*/
+        // 正式环境代码结束
+        // 测试环境代码开始
+        request.setToken(geTokenTest());
+        request.setCAcc_ID(getCAccIdTest());
+        request.setConn(getConnTest());
+        // 测试环境代码结束
         StringBuffer strWhere = new StringBuffer("1=1 and ccode = ").append("'"+detailDTO.getYongYouId()+"'");
         request.setStrWhere(strWhere.toString());
         GetPurchaseDetailListHandler handler = new GetPurchaseDetailListHandler();
@@ -578,8 +621,6 @@ public class YongyouServiceImpl implements YongyouService {
 
     @Override
     public String deletePurchaseOrder(String id) {
-
-
         LongYanPurchaseOrder order = new LongYanPurchaseOrder();
         order.setYongYouId(id);
         List<LongYanPurchaseOrder> list =  longYanPurchaseOrderMapper.select(order);
@@ -590,9 +631,16 @@ public class YongyouServiceImpl implements YongyouService {
         DeletePurchaseOrderRequest request = new DeletePurchaseOrderRequest();
         request.setCcode(list.get(0).getYongYouId());
         request.setTradeID("");
-        request.setToken(geToken(list.get(0).getOldOrNew()));
+        // 正式环境代码开始
+        /*request.setToken(geToken(list.get(0).getOldOrNew()));
         request.setCAcc_ID(getCAccId2(list.get(0).getOldOrNew()));
-        request.setConn(getConn2(list.get(0).getOldOrNew()));
+        request.setConn(getConn2(list.get(0).getOldOrNew()));*/
+        // 正式环境代码结束
+        // 测试环境代码开始
+        request.setToken(geTokenTest());
+        request.setCAcc_ID(getCAccIdTest());
+        request.setConn(getConnTest());
+        // 测试环境代码结束
         DeletePurchaseOrderHandler handler = new DeletePurchaseOrderHandler();
         handler.setRequest(request);
         String responseStr = handler.handler();
@@ -662,9 +710,16 @@ public class YongyouServiceImpl implements YongyouService {
         PushPurchaseOrderRequest request = new PushPurchaseOrderRequest();
         request.setPuAppVouch(puAppVouch);
         request.setTradeID("");
-        request.setToken(geToken(vo.getOldOrNew()));
+        // 正式环境代码开始
+        /*request.setToken(geToken(vo.getOldOrNew()));
         request.setCAcc_ID(getCAccId2(vo.getOldOrNew()));
-        request.setConn(getConn2(vo.getOldOrNew()));
+        request.setConn(getConn2(vo.getOldOrNew()));*/
+        // 正式环境代码结束
+        // 测试环境代码开始
+        request.setToken(geTokenTest());
+        request.setCAcc_ID(getCAccIdTest());
+        request.setConn(getConnTest());
+        // 测试环境代码结束
         PushPurchaseOrderHandler handler = new PushPurchaseOrderHandler();
         handler.setRequest(request);
         String responseStr = handler.handler();
@@ -706,15 +761,16 @@ public class YongyouServiceImpl implements YongyouService {
         Inventory.setDModifyDate(DateUtils.dateToString(LocalDateTime.now()));
         request.setInventory(Inventory);
         request.setTradeID("");
-        request.setToken(geToken(longYanSpareAdd.getTokenType()));
+        // 正式环境代码开始
+        /*request.setToken(geToken(longYanSpareAdd.getTokenType()));
         request.setConn(getConn2(longYanSpareAdd.getTokenType()));
-        request.setCAcc_ID(getCAccId2(longYanSpareAdd.getTokenType()));
-        /*if (tokenType == 1){ // 新厂
-            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key1));
-        }else if (tokenType==2){ // 老厂
-            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key2));
-        }*/
-//            pakageAndInsertSpare(Inventory, userInfo,longYanSpareAdd);
+        request.setCAcc_ID(getCAccId2(longYanSpareAdd.getTokenType()));*/
+        // 正式环境代码结束
+        // 测试环境代码开始
+        request.setToken(geTokenTest());
+        request.setConn(getConnTest());
+        request.setCAcc_ID(getCAccIdTest());
+        // 测试环境代码结束
         AddSpareHandler handler = new AddSpareHandler();
         handler.setRequest(request);
         String responseStr = handler.handler();
@@ -746,8 +802,6 @@ public class YongyouServiceImpl implements YongyouService {
             Inventory.setCInvName(inventoryTest.getCestInvName());
             Inventory.setCInvStd(inventoryTest.getCestInvStd());
             Inventory.setCInvCCode(inventoryTest.getCestInvCode());
-
-//            Inventory.setCInvCode(IdGeneratorUtils.getObjectId());
             Inventory.setCGroupCode("1");
             Inventory.setCCAComUnitCode(inventoryTest.getCestComUnitCode());
             Inventory.setCPlanMethod(inventoryTest.getCestPlanMethod());
@@ -755,21 +809,22 @@ public class YongyouServiceImpl implements YongyouService {
             Inventory.setFConvertRate(1);
             Inventory.setIRequireTrackStyle(inventoryTest.getCestIrequireTrackStyle());
             AddSpareRequest request = new AddSpareRequest();
-
             UserInfo userInfo = SecurityUtils.getUserInfo();
             Inventory.setDInvCreateDatetime(DateUtils.dateToString(LocalDateTime.now()));
             Inventory.setCModifyPerson(userInfo.getRealName());
             Inventory.setDModifyDate(DateUtils.dateToString(LocalDateTime.now()));
             request.setInventory(Inventory);
             request.setTradeID("");
-            request.setToken(geToken(tokenType));
+            // 正式环境代码开始
+           /* request.setToken(geToken(tokenType));
             request.setConn(getConn2(tokenType));
-            request.setCAcc_ID(getCAccId2(tokenType));
-        /*if (tokenType == 1){ // 新厂
-            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key1));
-        }else if (tokenType==2){ // 老厂
-            request.setCAcc_ID(RedisUtils.get(cAcc_ID_key2));
-        }*/
+            request.setCAcc_ID(getCAccId2(tokenType));*/
+            // 正式环境代码结束
+            // 测试环境代码开始
+            request.setToken(geTokenTest());
+            request.setConn(getConnTest());
+            request.setCAcc_ID(getCAccIdTest());
+            // 测试环境代码结束
             pakageAndInsertSpare(Inventory, userInfo,longYanSpareAdd);
             AddSpareHandler handler = new AddSpareHandler();
             handler.setRequest(request);
@@ -872,6 +927,76 @@ public class YongyouServiceImpl implements YongyouService {
         return myVOPage;
     }
 
+    @Override
+    public AbstractPageResultBean<SpareStoreVO> selectPageListTest(SpareStoreDTO record, int pageNum, int pageSize) {
+        // 已生成情况，直接推送
+        GetCurrentStockHandler handler = new GetCurrentStockHandler();
+        GetCurrentStockRequest req = new GetCurrentStockRequest();
+        req.setToken(geTokenTest());
+        req.setConn(getConnTest());
+        req.setCAcc_ID(getCAccIdTest());
+        req.setPageNum(pageNum);
+        req.setPageSize(pageSize);
+        StringBuffer whereStr = new StringBuffer(" 1=1 ");
+        // 仓库编码搜索
+        if (StringUtils.isNotBlank(record.getStoreNo())) {
+            whereStr.append(" and cWhCode like '%" + record.getStoreNo() + "%' ");
+        }
+        // 仓库名称搜索
+        if (StringUtils.isNotBlank(record.getStoreName())) {
+            whereStr.append(" and cWhName like '%" + record.getStoreName() + "%' ");
+        }
+        // 存货编码搜索
+        if (StringUtils.isNotBlank(record.getSpareNo())) {
+            whereStr.append(" and cInvCode like '%" + record.getSpareNo() + "%' ");
+        }
+        // 存货名称搜索
+        if (StringUtils.isNotBlank(record.getSpareName())) {
+            whereStr.append(" and cInvName like '%" + record.getSpareName() + "%' ");
+        }
+        // 规格型号搜索
+        if (StringUtils.isNotBlank(record.getGgxh())) {
+            whereStr.append(" and cInvStd like '%" + record.getGgxh() + "%' ");
+        }
+        req.setStrWhere(whereStr.toString());
+        handler.setRequest(req);
+        String responseStr = handler.handler();
+        GetCurrentStockResponse response = JSONObject.parseObject(responseStr, GetCurrentStockResponse.class);
+        if (!response.getResult()) {
+            throw new BusinessException(response.getMsg());
+        }
+        GetCurrentStockResponseData data = response.getData();
+        List<GetCurrentStock> stocks = data.getStock();
+        List<SpareStoreVO> partInfoVOS = new ArrayList<>();
+        for (GetCurrentStock stockResponse : stocks) {
+            SpareStoreVO partInfoVO = new SpareStoreVO();
+            partInfoVO.setId(stockResponse.getAutoId() + "");
+            partInfoVO.setNo(stockResponse.getCInvCode());
+            partInfoVO.setSpareId(stockResponse.getPartId() + "");
+            partInfoVO.setSpareName(stockResponse.getCInvName());
+            partInfoVO.setGgxh(stockResponse.getCInvStd());
+            partInfoVO.setNum(stockResponse.getIQuantity());
+            partInfoVO.setStoreName(stockResponse.getCWhName());
+            partInfoVO.setStoreId(stockResponse.getCWhCode());
+            partInfoVO.setUnit(stockResponse.getCComUnitName());
+            partInfoVO.setCBatch(stockResponse.getCBatch());
+            partInfoVO.setAutoId(stockResponse.getAutoId());
+            partInfoVO.setStorePosition(stockResponse.getCInvDefine1());
+            partInfoVOS.add(partInfoVO);
+        }
+
+        //PageHelper.startPage(pageNum, pageSize);
+        MyVOPage<SpareStoreVO> myVOPage = new MyVOPage<>();
+        myVOPage.setPageNum(pageNum);
+        myVOPage.setPageSize(pageSize);
+        Page page = new Page(pageNum, pageSize);
+        page.setTotal(data.getTotal());
+        myVOPage.setPages(data.getPages().intValue());
+        myVOPage.setTotal(page.getTotal());
+        myVOPage.setRows(partInfoVOS);
+        return myVOPage;
+    }
+
     /**
      * 提交出库单到用友
      *