diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/EmBiStructivtMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/EmBiStructivtMapper.java index bda944e4..727ed553 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/EmBiStructivtMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/EmBiStructivtMapper.java @@ -1,5 +1,6 @@ package org.nl.wms.device_manage.ios.service.structIvt.dao.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.nl.common.domain.query.PageQuery; @@ -28,4 +29,7 @@ public interface EmBiStructivtMapper extends BaseMapper { List getSemiProductIvt(@Param("query") StructIvtEmQuery query); List getStructIvt(@Param("query") StructIvtEmQuery query); + + List getIvtPor(); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml index 57ce08e9..e52062d5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml @@ -186,4 +186,20 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java index 4ac6e96c..94e7158f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java @@ -1,5 +1,6 @@ package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,5 +21,12 @@ public interface StIvtStructivtDailyMapper extends BaseMapper selectStructivt(@Param("table") String table); + + /** + * 大屏数据 - 近一周工段产量 + * @param list / + * @return / + */ + List getHistoryivt(@Param("chanList") List list, @Param("query") Map json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml index fd4511cc..43dda196 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml @@ -1,5 +1,32 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java index af12cf95..8c4b2350 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java @@ -261,4 +261,19 @@ public class MpsSaleOrder implements Serializable{ */ @ApiModelProperty(value = "/**后段提交标记*/") private String behind_submit_flag; + /** + * 需生产数量 + */ + @ApiModelProperty(value = "/**需生产数量*/") + private BigDecimal need_product_qty; + /** + * 刻字数量 + */ + @ApiModelProperty(value = "/**刻字数量*/") + private BigDecimal lettering_qty; + /** + * 刻字数量 + */ + @ApiModelProperty(value = "/**入库数量*/") + private BigDecimal in_storage_qty; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml index 22750a36..b374fc9b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml @@ -9,6 +9,8 @@ DATE_FORMAT(der.behind_plandeliver_date, '%Y-%m-%d' ) AS behindPlandeliverDate, DATE_FORMAT(der.create_time, '%Y-%m-%d %H:%i:%s' ) AS createTime, DATE_FORMAT(der.aps_update_time, '%Y-%m-%d %H:%i:%s' ) AS apsUpdateTime, + DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 7 DAY), '%Y-%m-%d') AS order_date, + DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 3 DAY), '%Y-%m-%d') AS warehousing_date, mater.material_name FROM mps_sale_order der @@ -22,13 +24,13 @@ and der.status = #{query.status} - and der.sale_type >= #{query.sale_type} + and der.sale_type = #{query.sale_type} - and der.create_mode >= #{query.create_mode} + and der.create_mode = #{query.create_mode} - and der.cust_code >= #{query.cust_code} + and der.cust_code = #{query.cust_code} and der.create_time >= #{query.start_time} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java index 0370346f..d6a57ccc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java @@ -160,6 +160,9 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl meMaterialBases = materialbaseService.list(new QueryWrapper().eq("material_spec", col)); + List meMaterialBases; + if(StringUtils.isNotBlank(mpsSaleOrder.getMaterial_code())) { + meMaterialBases = materialbaseService.list(new QueryWrapper().eq("material_code", mpsSaleOrder.getMaterial_code())); + } + else{ + meMaterialBases = materialbaseService.list(new QueryWrapper().eq("material_spec", col)); + } if(CollectionUtils.isEmpty(meMaterialBases)) { + //如果不是一线物料，就跳过不导入该订单 break; } else{ @@ -258,14 +274,14 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl salesOrders = baseMapper.queryAll(orderQuery); - //相同订单号 - if(salesOrders.size() > 0) { - List salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList()); - if(salesOrderList.size() > 0) { - continue; - } - else{ - Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null); - int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no"); - mpsSaleOrder.setSeq_no(maxSeqNoValue + 100); + OrderQuery orderQuery = new OrderQuery(); + orderQuery.setSale_code(mpsSaleOrder.getSale_code()); + orderQuery.setStatus(SaleOrderEnum.CREATE.getCode()); + List salesOrders = baseMapper.queryAll(orderQuery); + //相同订单号 + if(salesOrders.size() > 0) { + List salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList()); + if(salesOrderList.size() > 0) { + continue; + } + else{ + Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null); + int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no"); + mpsSaleOrder.setSeq_no(maxSeqNoValue + 100); + } } + mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no()); } - mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no()); if(CollectionUtils.isEmpty(errorMap)) { if(mpsSaleOrder.getSale_code() != null) { data.add(mpsSaleOrder); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java index 3a35659b..5883257d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -1,5 +1,6 @@ package org.nl.wms.pcs_manage.controller.purchase; +import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import org.nl.common.anno.Log; @@ -46,6 +47,14 @@ public class PcsIfPurchaseorderController{ return new ResponseEntity<>(purchaseorderService.queryRawIn(query, page), HttpStatus.OK); } +// @GetMapping(value = "/queryApt") +// @SaIgnore +// @Log("测试") +// public String queryApt() { +// String result="{\n" + " \"Msg_DisplayState\":{\n" + " \"AGV_ID\":255,\n" + " \"Auto_In_Line_State\":0,\n" + " \"Bosch_Car_Global_Theta\":-90.19221757272916,\n" + " \"Bosch_Car_Global_rx\":-1.0619603784858553,\n" + " \"Bosch_Car_Global_ry\":0.0020978358374357303,\n" + " \"Bosch_Loc_State\":-2,\n" + " \"Bosch_No_Rec_State\":0,\n" + " \"Bosch_raw_age\":0.01389455795288086,\n" + " \"Bosch_raw_epoch\":1,\n" + " \"Bosch_raw_locState\":-2,\n" + " \"Bosch_raw_qw\":0.9999999908132869,\n" + " \"Bosch_raw_qx\":0,\n" + " \"Bosch_raw_qy\":0,\n" + " \"Bosch_raw_qz\":0.00013554861104682667,\n" + " \"Bosch_raw_timestamp\":1695633231.1093392,\n" + " \"Bosch_raw_uniqueId\":0,\n" + " \"Bosch_raw_x\":0.0008994877773440588,\n" + " \"Bosch_raw_x_odo\":0.0008994877773440588,\n" + " \"Bosch_raw_y\":0.0006906610801896382,\n" + " \"Bosch_raw_y_odo\":0.0006906610801896382,\n" + " \"Bosch_raw_yaw\":0.00027109722292381746,\n" + " \"Bosch_raw_yaw_odo\":0.0006906610801896382,\n" + " \"Bosch_raw_z\":0,\n" + " \"CAD_Or_TCS_Ctrl\":0,\n" + " \"Car_Global_Theta\":-90.19221757272916,\n" + " \"Car_Global_rx\":-1.0619603784858553,\n" + " \"Car_Global_ry\":0.0020978358374357303,\n" + " \"CurNodeID\":0,\n" + " \"Cur_Stop_Info1_Authorized_Pass\":1,\n" + " \"Cur_Stop_Info1_High_Precious_Enable\":1,\n" + " \"Cur_Stop_Info1_Reached_Stop\":0,\n" + " \"Cur_Stop_Info1_Set_Patht\":0,\n" + " \"Cur_Stop_Info1_Set_Pathx\":0,\n" + " \"Cur_Stop_Info1_Set_Pathy\":0,\n" + " \"Cur_Stop_Info1_Single_Request_Sch\":0,\n" + " \"Cur_Stop_Info1_Single_Stop_Sch\":0,\n" + " \"Cur_Stop_Info1_StopEndNode\":0,\n" + " \"Cur_Stop_Info1_StopStartNode\":0,\n" + " \"Cur_Stop_Info1_Stop_Endt\":0,\n" + " \"Cur_Stop_Info1_Stop_Endx\":0,\n" + " \"Cur_Stop_Info1_Stop_Endy\":0,\n" + " \"Cur_Stop_Info1_Stop_Num\":0,\n" + " \"Cur_Stop_Info2_Authorized_Pass\":1,\n" + " \"Cur_Stop_Info2_High_Precious_Enable\":1,\n" + " \"Cur_Stop_Info2_Reached_Stop\":0,\n" + " \"Cur_Stop_Info2_Set_Patht\":0,\n" + " \"Cur_Stop_Info2_Set_Pathx\":0,\n" + " \"Cur_Stop_Info2_Set_Pathy\":0,\n" + " \"Cur_Stop_Info2_Single_Request_Sch\":0,\n" + " \"Cur_Stop_Info2_Single_Stop_Sch\":0,\n" + " \"Cur_Stop_Info2_StopEndNode\":0,\n" + " \"Cur_Stop_Info2_StopStartNode\":0,\n" + " \"Cur_Stop_Info2_Stop_Endt\":0,\n" + " \"Cur_Stop_Info2_Stop_Endx\":0,\n" + " \"Cur_Stop_Info2_Stop_Endy\":0,\n" + " \"Cur_Stop_Info2_Stop_Num\":0,\n" + " \"Curtis_Warning_Code_Pump\":0,\n" + " \"Curtis_Warning_Code_Speed\":82,\n" + " \"Curtis_Warning_Code_Steer\":0,\n" + " \"EndNode\":0,\n" + " \"Env_CustomName\":\"NobleLift\",\n" + " \"Env_HMIUseJavaApp\":\"true\",\n" + " \"Env_LearnEnable\":\"true\",\n" + " \"Env_Lu_ROS_IP2\":\"\",\n" + " \"Env_SoftwareVersion\":\"[Version]Magic4.1[Info]2023_09_21_20_41_37_Lu_ROS_magic4_waypointab_v31\",\n" + " \"Env_VehicleType\":\"PS10LMT_HuaHai\",\n" + " \"Get_Nav350_Curr_Layer\":0,\n" + " \"Language\":1022739087,\n" + " \"LastAltitudeExpectValue_mm\":0,\n" + " \"LastGantryXExpectValue_mm\":0,\n" + " \"LastGantryYExpectValue_mm\":0,\n" + " \"Lateral_Deviation_m\":119.00021121312,\n" + " \"License_Info\":\"EC060800FFFBEBBF 6B7685747EBC EC060800FFFBEBBF 6B7685747EBC 2021/8/26 13:46:47 2021/8/26 13:46:47 1 UserClass5 Magic4_1\",\n" + " \"LindeAgwSteerCenterPivotPlateAng\":0,\n" + " \"LindeAgwSteerErrorFlag\":0,\n" + " \"LindeAgwSteerModeSelectorState\":0,\n" + " \"LindeAgwTracLiftErrorFlag\":0,\n" + " \"LindeAgwTracLiftModeSelectorState\":0,\n" + " \"LindeDriveErrCode1\":0,\n" + " \"LindeDriveErrCode2\":0,\n" + " \"LindeDriveErrCode3\":0,\n" + " \"LindeDriveErrCode4\":0,\n" + " \"LindeLiftErrCode1\":0,\n" + " \"LindeLiftErrCode2\":0,\n" + " \"LindeLiftErrCode3\":0,\n" + " \"LindeLiftErrCode4\":0,\n" + " \"LindeSteerErrCode1\":0,\n" + " \"LindeSteerErrCode2\":0,\n" + " \"LindeSteerErrCode3\":0,\n" + " \"LindeSteerErrCode4\":0,\n" + " \"Login_Info\":\"\",\n" + " \"Min_Dist\":0,\n" + " \"MissionCompleteAltitude_mm_RemoteOrHMI_FB\":0,\n" + " \"MissionCompleteGantryX_mm_RemoteOrHMI_FB\":0,\n" + " \"MissionCompleteGantryY_mm_RemoteOrHMI_FB\":0,\n" + " \"Navi_Method\":3,\n" + " \"ObstacleDetectState\":0,\n" + " \"ObstacleTouchState\":0,\n" + " \"Out_Of_Path_Times\":0,\n" + " \"PFC_Sch\":0,\n" + " \"PFC_State\":\"[PathFollow_Control_Handle_WLANJSON][PathFollow_Schedule_WLANJSON=0]\\n\",\n" + " \"PLC_Warning_Code\":0,\n" + " \"PWR_Percent\":100,\n" + " \"PWR_Warn\":0,\n" + " \"PathFollow_Enable\":0,\n" + " \"PathFollow_Expect_AltitudeCtrlEnable\":0,\n" + " \"PathFollow_Expect_GantryXCtrlEnable\":0,\n" + " \"PathFollow_Expect_GantryYCtrlEnable\":0,\n" + " \"Plate_Check_Err_Code\":0,\n" + " \"ReachState\":0,\n" + " \"RealAutoChargeState\":0,\n" + " \"Ref_std_rt\":0,\n" + " \"Ref_std_rx\":0,\n" + " \"Ref_std_ry\":0,\n" + " \"Remote_Or_HMI_Ctrl\":1,\n" + " \"SVreal_angle\":55,\n" + " \"Sche_JSON_Sche_Enable\":0,\n" + " \"Speedm_Tmp\":11,\n" + " \"StartNode\":0,\n" + " \"Sub_Warning_Code0\":0,\n" + " \"Sys_Mode\":4,\n" + " \"Task_Sch\":0,\n" + " \"Task_State\":\"\",\n" + " \"Update_Sch\":0,\n" + " \"Update_State\":\"\",\n" + " \"VehicleCtrlExpThrottle\":222,\n" + " \"VehicleCtrlRealAltitude_mm\":998,\n" + " \"VehicleCtrlRealCustomStateByte0\":0,\n" + " \"VehicleCtrlRealCustomStateByte1\":0,\n" + " \"VehicleCtrlRealCustomStateByte2\":0,\n" + " \"VehicleCtrlRealCustomStateByte3\":0,\n" + " \"VehicleCtrlRealGantryX_mm\":0,\n" + " \"VehicleCtrlRealGantryY_mm\":0,\n" + " \"VehicleCtrlRealJoyEnable\":0,\n" + " \"VehicleCtrlRealRCEnable\":0,\n" + " \"VehicleCtrl_CAN_Err_Info\":0,\n" + " \"Vertical_Deviation_deg\":0.232222321,\n" + " \"Warning_Code\":20971522,\n" + " \"header\":{\n" + " \"frame_id\":\"\",\n" + " \"seq\":1904,\n" + " \"stamp\":{\n" + " \"nsec\":160948865,\n" + " \"sec\":1695633231\n" + " }\n" + " }\n" + " }\n" + "}"; +// return result; +// } + @GetMapping @Log("原料计划分页查询") public ResponseEntity pageQuery(PurchaseOrderQuery query, PageQuery page) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java index a7f606d4..3c8224fe 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -1,15 +1,10 @@ package org.nl.wms.pcs_manage.service.purchase.dao; - import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import java.io.Serializable; import java.util.Date; - import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/HistoryivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/HistoryivtController.java new file mode 100644 index 00000000..150361f0 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/HistoryivtController.java @@ -0,0 +1,48 @@ + +package org.nl.wms.stata_manage.rest; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.stata_manage.service.HistoryivtService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @author Liuxy + * @date 2022-06-28 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "历史库存统计分析") +@RequestMapping("/api/historyivt") +@Slf4j +public class HistoryivtController { + + private final HistoryivtService historyivtService; + + @GetMapping + @ApiOperation("库存查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(historyivtService.queryAll(whereJson, page), HttpStatus.OK); + } + + @GetMapping("/getHeader") + @ApiOperation("获取表头") + public ResponseEntity getHeader() { + return new ResponseEntity<>(historyivtService.getHeader(), HttpStatus.OK); + } + + @PostMapping("/autoWeb") + @ApiOperation("线性图") + public ResponseEntity autoWeb(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(historyivtService.autoWeb(whereJson), HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java new file mode 100644 index 00000000..8e8b2d6b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java @@ -0,0 +1,42 @@ + +package org.nl.wms.stata_manage.rest; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.stata_manage.service.RealTimeIvtService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @author Liuxy + * @date 2022-06-28 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "实时库存统计分析") +@RequestMapping("/api/realtimeivt") +@Slf4j +public class RealTimeIvtController { + + private final RealTimeIvtService realTimeIvtService; + + @GetMapping + @ApiOperation("库存查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(realTimeIvtService.queryAll(whereJson, page), HttpStatus.OK); + } + + @PostMapping("/autoWeb") + @ApiOperation("饼图") + public ResponseEntity autoWeb(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(realTimeIvtService.autoWeb(whereJson), HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/HistoryivtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/HistoryivtService.java new file mode 100644 index 00000000..ee848525 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/HistoryivtService.java @@ -0,0 +1,39 @@ + +package org.nl.wms.stata_manage.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + +/** + * @author Liuxy + * @description 服务接口 + * @date 2022-06-28 + **/ +public interface HistoryivtService { + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 获取表头 + */ + JSONArray getHeader(); + + /** + * 线形图数据获取 + * @return / + */ + JSONObject autoWeb( JSONObject whereJson ); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/RealTimeIvtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/RealTimeIvtService.java new file mode 100644 index 00000000..a196ddcd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/RealTimeIvtService.java @@ -0,0 +1,40 @@ + +package org.nl.wms.stata_manage.service; + +import com.alibaba.fastjson.JSONObject; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; + +/** + * @author Liuxy + * @description 服务接口 + * @date 2022-06-28 + **/ +public interface RealTimeIvtService { + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + + /** + * 饼图数据获取 + * @return / + */ + JSONObject autoWeb( JSONObject whereJson ); + + /** + * 根据仓库查询不同仓库得来类型 + * @param whereJson 、 + * @return 、 + */ + List queryIvt(Map whereJson); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/dto/StorUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/dto/StorUtil.java new file mode 100644 index 00000000..cced4a8d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/dto/StorUtil.java @@ -0,0 +1,9 @@ +package org.nl.wms.stata_manage.service.dto; +public class StorUtil { + public static final String STOR_YL = "1528627964823080960"; + public static final String STOR_CP = "1528627995269533696"; + public static final String STOR_BCP = "15286279952695336962"; + public static final String STOR_HR_BCP = "15286279952695336963"; + public static final String STOR_BJ = "15286279952695336977"; +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/HistoryivtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/HistoryivtServiceImpl.java new file mode 100644 index 00000000..c9f65e57 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/HistoryivtServiceImpl.java @@ -0,0 +1,211 @@ + +package org.nl.wms.stata_manage.service.impl; + + +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.common.utils.PageUtil; +import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper.StIvtStructivtDailyMapper; +import org.nl.wms.stata_manage.service.HistoryivtService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author Liuxy + * @description 服务实现 + * @date 2022-06-28 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class HistoryivtServiceImpl implements HistoryivtService { + + @Autowired + private StIvtStructivtDailyMapper stIvtStructivtDailyMapper; + + @Override + public Map queryAll(Map whereJson, Pageable page) { + + String endTime = DateUtil.today(); + DateTime toDay = DateUtil.parse(endTime); + + String startTime = DateUtil.offsetDay(toDay, -6).toString().substring(0, 10); + + // 7天时间集合 + List timeList = + DateUtil.rangeToList(DateUtil.parse(startTime), DateUtil.parse(endTime), DateField.DAY_OF_YEAR) + .stream() + .map(row -> row.toString().substring(0,10)) + .collect(Collectors.toList()); + + List ivtList = stIvtStructivtDailyMapper.getHistoryivt(timeList, whereJson); + + // 处理数据 + JSONArray data = new JSONArray(); + + Map> ivt = ivtList.stream().collect(Collectors.groupingBy( + row -> row.getString("material_code") + )); + + for (String material_coed: ivt.keySet()) { + + // 找出相同数据 + List findList = ivtList.stream() + .filter(row -> row.getString("material_code").equals(material_coed)) + .collect(Collectors.toList()); + + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("1", findList.get(0).getString("material_code")); + jsonObject.put("2", findList.get(0).getString("material_name")); + jsonObject.put("3", findList.get(0).getString("material_spec")); + + for (JSONObject json : findList) { + jsonObject.put(json.getString("create_time"), NumberUtil.round(json.getDoubleValue("canuse_qty"), 3)); + } + + data.add(jsonObject); + } + + // 处理分页 + Map json = PageUtil.toPage( + PageUtil.toPage(page.getPageNumber(), page.getPageSize(), data), + data.size() + ); + + return json; + } + + @Override + public JSONArray getHeader() { + JSONArray jsonResultArr = new JSONArray(); + + // 获取日期: 当前日期前7天 + String todayStr = DateUtil.today(); + DateTime toDay = DateUtil.parse(todayStr); + + for (int i = 6; i >=0; i--) { + DateTime dateTime = DateUtil.offsetDay(toDay, -i); + + JSONObject json = new JSONObject(); + json.put("prop", dateTime.toString().substring(0, 10)); + json.put("label", dateTime.toString().substring(0, 10)); + jsonResultArr.add(json); + } + return jsonResultArr; + } + + @Override + public JSONObject autoWeb(JSONObject whereJson) { + /* + * 处理数据 + * 1.legend：每条线的名称 + * 2.xAxis：所有日期 + * 3.series：具体数据 + */ + + // 3.具体数据 + List allList = publicMethodQuery(whereJson); + + // 1.每条线的名称 + List legendList = allList.stream() + .map(row -> row.getString("name")) + .collect(Collectors.toList()); + + // 2.所有日期 + JSONArray headerArr = getHeader(); + + List xAxisList = headerArr.stream() + .map(row -> ((JSONObject) row).getString("prop")) + .collect(Collectors.toList()); + + // 整理数据 + JSONObject result = new JSONObject(); + result.put("legenda",legendList); + result.put("xAxisa",xAxisList); + result.put("seriesa",allList); + return result; + } + + /** + * 查询共用方法 + * @param whereJson 、 + * @return 、 + */ + private List publicMethodQuery(Map whereJson) { + + String endTime = DateUtil.today(); + DateTime toDay = DateUtil.parse(endTime); + + String startTime = DateUtil.offsetDay(toDay, -6).toString().substring(0, 10); + + // 7天时间集合 + List timeList = + DateUtil.rangeToList(DateUtil.parse(startTime), DateUtil.parse(endTime), DateField.DAY_OF_YEAR) + .stream() + .map(row -> row.toString().substring(0,10)) + .collect(Collectors.toList()); + + List ivtList = stIvtStructivtDailyMapper.getHistoryivt(timeList, whereJson); + + // 处理数据 + List alldataList = new ArrayList<>(); + + Map> ivt = ivtList.stream().collect(Collectors.groupingBy( + row -> row.getString("material_code") + )); + + for (String material_coed: ivt.keySet()) { + + // 找出相同数据 + List findList = ivtList.stream() + .filter(row -> row.getString("material_code").equals(material_coed)) + .collect(Collectors.toList()); + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("name", findList.get(0).getString("material_code")); + jsonObject.put("type", "line"); + jsonObject.put("stack", "Total"); + + JSONArray data = new JSONArray(); + + JSONArray headerArr = getHeader(); + List xAxisList = headerArr.stream() + .map(row -> ((JSONObject) row).getString("prop")) + .collect(Collectors.toList()); + + xAxisList.forEach(row -> { + for (JSONObject json : findList) { + + if (json.getString("create_time").equals(row)) { + data.add(NumberUtil.round(json.getDoubleValue("canuse_qty"), 3)); + } else { + data.add(0); + } + } + }); + + jsonObject.put("data", data); + + alldataList.add(jsonObject); + } + return alldataList; + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/RealTimeIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/RealTimeIvtServiceImpl.java new file mode 100644 index 00000000..0a477bb3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/RealTimeIvtServiceImpl.java @@ -0,0 +1,113 @@ + +package org.nl.wms.stata_manage.service.impl; + + +import cn.hutool.core.map.MapUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.utils.PageUtil; +import org.nl.wms.device_manage.ios.service.structIvt.dao.mapper.EmBiStructivtMapper; +import org.nl.wms.stata_manage.service.RealTimeIvtService; +import org.nl.wms.stata_manage.service.dto.StorUtil; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtYlMapper; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper; +import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.mapper.StIvtStructivtHrBcpMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author Liuxy + * @description 服务实现 + * @date 2022-06-28 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class RealTimeIvtServiceImpl implements RealTimeIvtService { + + @Autowired + private StIvtStructivtYlMapper stIvtStructivtYlMapper; // 原料 + + @Autowired + private StIvtStructivtBcpMapper stIvtStructivtBcpMapper; // 半成品 + + @Autowired + private StIvtStructivtCpMapper stIvtStructivtCpMapper; // 成品 + + @Autowired + private StIvtStructivtHrBcpMapper stIvtStructivtHrBcpMapper; // 海柔半成品 + + @Autowired + private EmBiStructivtMapper emBiStructivtMapper; // 备件 + + @Override + public Map queryAll(Map whereJson, Pageable page) { + List allList = queryIvt(whereJson); + + // 组织分页 + Map json = PageUtil.toPage( + PageUtil.toPage(page.getPageNumber(), page.getPageSize(), allList), + allList.size() + ); + + return json; + } + + @Override + public JSONObject autoWeb(JSONObject whereJson) { + List allList = queryIvt(whereJson); + + // 处理数据 + List resultList = allList.stream() + .map(row -> { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("name", row.getString("material_code")); + jsonObject.put("value", row.getDoubleValue("pro")); + return jsonObject; + }) + .collect(Collectors.toList()); + + JSONObject result = new JSONObject(); + result.put("ivtList", resultList); + return result; + } + + @Override + public List queryIvt(Map whereJson) { + + String stor_id = MapUtil.getStr(whereJson, "stor_id"); + + List result = new ArrayList<>(); + + switch (stor_id) { + case StorUtil.STOR_YL : + result = stIvtStructivtYlMapper.getIvtPor(); + break; + + case StorUtil.STOR_BCP : + result = stIvtStructivtBcpMapper.getIvtPor(); + break; + + case StorUtil.STOR_CP : + result = stIvtStructivtCpMapper.getIvtPor(); + break; + + case StorUtil.STOR_HR_BCP : + result = stIvtStructivtHrBcpMapper.getIvtPor(); + break; + + case StorUtil.STOR_BJ : + result = emBiStructivtMapper.getIvtPor(); + break; + } + return result; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java index 74f6ae00..70756274 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java @@ -33,4 +33,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper { List getStructAll(@Param("chanList") List list); + List getIvtPor(); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml index 4afe6843..22be2437 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml @@ -236,4 +236,20 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java index 68efdc83..1c6488f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java @@ -1,5 +1,6 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper; +import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import org.nl.common.domain.query.PageQuery; import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; @@ -29,4 +30,6 @@ public interface StIvtStructivtYlMapper extends BaseMapper { List getSemiProductIvt(@Param("query") StructIvtYLQuery query); List getStructIvt(@Param("query") StructIvtYLQuery query); + + List getIvtPor(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml index 4d139bcd..5caf3888 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml @@ -192,4 +192,20 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java index 0f58b14f..9b4096e3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java @@ -38,4 +38,6 @@ public interface StIvtStructivtBcpMapper extends BaseMapper { List getPdaBcpMaterialIvt(JSONObject jo); StIvtStructivtBcp queryIvtOutOne(JSONObject json); + + List getIvtPor(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index d9cde3f3..ff11ec73 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -271,4 +271,20 @@ LIMIT 1 + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java index 44db3d5e..cb3917d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java @@ -39,4 +39,7 @@ public interface StIvtStructivtHrBcpMapper extends BaseMapper getBcpMoveIvt(@Param("query") StructIvtYLQuery query); + + List getIvtPor(); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml index 6142814c..eb5b0dfa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml @@ -282,4 +282,20 @@ + + diff --git a/mes/qd/src/views/wms/pcs/purchaseorder/index.vue b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue index 14fd4621..cf3c0af6 100644 --- a/mes/qd/src/views/wms/pcs/purchaseorder/index.vue +++ b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue @@ -103,7 +103,7 @@ - + diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue index 37857e8f..5f489ab7 100644 --- a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue +++ b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue @@ -151,7 +151,7 @@ - + diff --git a/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue b/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue index 4a8e04d7..0915d596 100644 --- a/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue +++ b/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue @@ -1,18 +1,18 @@ + + + + diff --git a/mes/qd/src/views/wms/stata_manage/realtimeivt/PieChart.vue b/mes/qd/src/views/wms/stata_manage/realtimeivt/PieChart.vue new file mode 100644 index 00000000..15d2087a --- /dev/null +++ b/mes/qd/src/views/wms/stata_manage/realtimeivt/PieChart.vue @@ -0,0 +1,101 @@ + + + diff --git a/mes/qd/src/views/wms/stata_manage/realtimeivt/index.vue b/mes/qd/src/views/wms/stata_manage/realtimeivt/index.vue new file mode 100644 index 00000000..39397245 --- /dev/null +++ b/mes/qd/src/views/wms/stata_manage/realtimeivt/index.vue @@ -0,0 +1,160 @@ + + + + diff --git a/mes/qd/src/views/wms/stata_manage/realtimeivt/realtimeivt.js b/mes/qd/src/views/wms/stata_manage/realtimeivt/realtimeivt.js new file mode 100644 index 00000000..0d3b45f9 --- /dev/null +++ b/mes/qd/src/views/wms/stata_manage/realtimeivt/realtimeivt.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/realtimeivt', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/realtimeivt/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/realtimeivt/update', + method: 'post', + data + }) +} + +export function autoWeb(data) { + return request({ + url: 'api/realtimeivt/autoWeb', + method: 'post', + data + }) +} + +export default { + add, + edit, + del, + autoWeb +}