| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/ViewInOutMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -232,8 +232,8 @@ @PostMapping("/arm/task/v1") @AppAuth(memo = "分拣线上报接收") public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey, @RequestBody TaskArmReportParam param, HttpServletRequest request) { @RequestBody TaskArmReportParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -277,8 +277,8 @@ @PostMapping("/arm/task/cycle_result") @AppAuth(memo = "单码完成") public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey, @RequestBody TaskArmCycleResultParam param, HttpServletRequest request) { @RequestBody TaskArmCycleResultParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -309,8 +309,8 @@ @PostMapping("/arm/task/workspace_status") @AppAuth(memo = "托盘完成") public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey, @RequestBody TaskArmWorkspaceStatusParam param, HttpServletRequest request) { @RequestBody TaskArmWorkspaceStatusParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -342,8 +342,8 @@ @PostMapping("/arm/task/loc_status") // @AppAuth(memo = "托盘就绪状态查询") public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey, @RequestBody ArmOKParam param, HttpServletRequest request) { @RequestBody ArmOKParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -369,8 +369,8 @@ @PostMapping("/armAbnormalOperation") // @AppAuth(memo = "异常上报") public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey, @RequestBody TaskArmErrorParam param, HttpServletRequest request) { @RequestBody TaskArmErrorParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param.getArm_no())) { return R.error("机械臂编号[Arm_no]不能为空"); @@ -478,7 +478,7 @@ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId())); int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",mesToCombParam.getPalletId()).eq("io_status", "Y")); if (countLoc > 0 || countWrk > 0 || countwait > 0) { return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在,无法删除"); return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在,无法删除"); } waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",mesToCombParam.getPalletId())); boo = true; @@ -810,7 +810,7 @@ * 入出库按小时折线：横轴为「当前整点起向前共 12 小时」滚动窗口，与库表 ymd（yyyy-MM-dd HH）对齐 */ @GetMapping("/line/charts/hourly") public synchronized R locIoLineChartsHourly() { public synchronized R locIoLineChartsHourly() { Map<String, Object> map = new HashMap<>(); List<AxisBean> list = new ArrayList<>();
@@ -51,8 +51,10 @@ List<Double> dbOverview = digitalTwinMapper.overview(areaId); if (dbOverview != null && !dbOverview.isEmpty()){ int total = (int)Math.round(dbOverview.get(0)); total = Math.min(total, 40000); DtOverviewVo dtOverviewVo = DtOverviewVo.builder() .totalLoc((int)Math.round(dbOverview.get(0))) .totalLoc(total) .useLoc((int)Math.round(dbOverview.get(1))) .remainingStock((int)Math.round(dbOverview.get(2))) .todayWarehousing((int)Math.round(dbOverview.get(3))) @@ -189,7 +191,7 @@ return dtInAndOutBoundVos; } /** * 近期近期呆滞品信息，默认超过30天为呆滞品 * 近期近期呆滞品信息，默认超过14天为呆滞品 * * @param areaId * @param overDayNum @@ -200,7 +202,7 @@ */ public List<DtDetainMatVo> recentDetainMat(String areaId, Integer overDayNum, Integer pageIndex, Integer pageSize, String condition) { overDayNum = overDayNum == null ? 30 : overDayNum; overDayNum = overDayNum == null ? 14 : overDayNum; pageIndex = pageIndex == null ? 1 : pageIndex; pageSize = pageSize == null ? 1000000 : pageSize;
@@ -15,6 +15,12 @@ # url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs username: sa password: sa@123 hikari: maximum-pool-size: 30 minimum-idle: 5 connection-timeout: 30000 idle-timeout: 600000 max-lifetime: 1800000 mvc: static-path-pattern: /** redis: @@ -93,7 +99,7 @@ ErpReportOld: true # 地址 address: URL: http://192.168.100.148:62482 URL: http://192.168.160.8:8088 #入库上报 Inaddress: /api/Service/InPalletCompleted #出库上报 src/main/resources/mapper/ViewInOutMapper.xml
@@ -80,4 +80,39 @@ </if> </select> <select id="selectlocChartPieArea" resultType="com.zy.asrs.entity.LocChartPie"> SELECT SUM(fqty) AS fqty, SUM(oqty) AS oqty, SUM(uqty) AS uqty, SUM(xqty) AS xqty FROM (SELECT COUNT(*) AS fqty, 0 AS oqty, 0 AS uqty, 0 AS xqty FROM dbo.asr_loc_mast WHERE ((loc_sts = 'F') OR (loc_sts = 'D')) <if test="startRow != null and endRow != null"> AND row1 > #{startRow} AND row1 < #{endRow} </if> UNION ALL SELECT 0 AS Expr1, COUNT(*) AS Expr2, 0 AS Expr3, 0 AS Expr4 FROM dbo.asr_loc_mast AS asr_loc_mast_3 WHERE (loc_sts = 'O') <if test="startRow != null and endRow != null"> AND row1 > #{startRow} AND row1 < #{endRow} </if> UNION ALL SELECT 0 AS Expr1, 0 AS Expr2, COUNT(*) AS Expr3, 0 AS Expr4 FROM dbo.asr_loc_mast AS asr_loc_mast_2 WHERE ((loc_sts = 'P') OR (loc_sts = 'Q') OR (loc_sts = 'R') OR (loc_sts = 'S')) <if test="startRow != null and endRow != null"> AND row1 > #{startRow} AND row1 < #{endRow} </if> UNION ALL SELECT 0 AS Expr1, 0 AS Expr2, 0 AS Expr3, COUNT(*) AS Expr4 FROM dbo.asr_loc_mast AS asr_loc_mast_1 WHERE (loc_sts = 'X') <if test="startRow != null and endRow != null"> AND row1 > #{startRow} AND row1 < #{endRow} </if> ) AS a </select> </mapper>
