zy-asrs-master.git

			@@ -1,19 +1,29 @@
			package com.zy.asrs.wms.asrs.controller;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.zy.asrs.common.domain.CodeRes;
			import com.zy.asrs.common.domain.enums.LoginSystemType;
			import com.zy.asrs.framework.annotations.ManagerAuth;
			import com.zy.asrs.framework.common.Cools;
			import com.zy.asrs.framework.common.R;
			import com.zy.asrs.framework.exception.CoolException;
			import com.zy.asrs.wms.asrs.entity.CacheSite;
			import com.zy.asrs.wms.asrs.entity.Loc;
			import com.zy.asrs.wms.asrs.entity.Order;
			import com.zy.asrs.wms.asrs.entity.WaitPakin;
			import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
			import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
			import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
			import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
			import com.zy.asrs.wms.asrs.entity.param.PageRequest;
			import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
			import com.zy.asrs.wms.asrs.service.MobileService;
			import com.zy.asrs.wms.asrs.service.OrderService;
			import com.zy.asrs.wms.asrs.service.WaitPakinService;
			import com.zy.asrs.wms.common.domain.BaseParam;
			import com.zy.asrs.wms.system.controller.BaseController;
			import com.zy.asrs.wms.system.entity.Host;
			import com.zy.asrs.wms.system.entity.User;
			@@ -64,10 +74,17 @@
			*/
			@PostMapping("/mat/auth")
			public R getProductForBarcode(@RequestBody Map<String, String> barcode) {
			if (Objects.isNull(barcode)) {
			return R.error("参数不能为空！！");
			}
			if (StringUtil.isNullOrEmpty(barcode.get("barcode"))) {
			return R.error("条码不能为空！！");
			}
			Order order = orderService.selectByBarcode(barcode.get("barcode"));

			if (Objects.isNull(order)) {
			return R.error("订单不存在！");
			}

			List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());

			@@ -75,12 +92,13 @@
			}

			/**
			* 平库上架
			* PDA扫码入库
			* 1. 绑定库位号与拖盘码
			* 2. 库位置为在库状态
			* @return
			*/
			@PostMapping("matnr/in/barcode")
			@PostMapping("/matnr/in/barcode")
			public R pakinToStock(@RequestBody PakinOnShelvesParams shelvesParams) {
			if (StringUtil.isNullOrEmpty(shelvesParams.getBarcode())) {
			return R.error("拖盘码不能为空！！");
			@@ -89,20 +107,24 @@
			return R.error("库位不能为空！！");
			}
			//TODO 绑定库位，添加库位明细
			if (mobileService.pakinToStock(shelvesParams)) {
			return R.ok("入库成功！！");
			} else {
			return R.error("入库失败！！");
			}

			return R.ok();
			}

			/**
			* 获取拖码盘绑定商品
			* 获取拖盘码绑定商品
			* @return
			*/
			@GetMapping("barcode/matnr/{code}")
			@GetMapping("/barcode/matnr/{code}")
			public R getAllGoods(@PathVariable String code) {
			if (!StringUtil.isNullOrEmpty(code)) {
			if (StringUtil.isNullOrEmpty(code)) {
			return R.error("托盘码不能为空！！");
			}
			List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, code).eq(WaitPakin::getIoStatus, 0));
			List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, code));

			return R.ok(waitPakins);
			}
			@@ -173,4 +195,102 @@
			}
			}

			/**
			* 获取拣货明细
			* @return
			*/
			@GetMapping("/pick/detl/{code}")
			public R pickDetlByPickNo(@PathVariable String code) {
			if (StringUtil.isNullOrEmpty(code)) {
			return R.error("拣货单据编码不能为空！！");
			}
			PickSheetDetlDto pickSheetDetls = mobileService.outFlatSheet(code);

			return R.ok(pickSheetDetls);
			}

			/**
			* 拣货单确认出库
			* @param code
			* @return
			*/
			@GetMapping("/pick/confirm/{code}")
			public R confirmOutFlatSheet(@PathVariable String code) {
			if (StringUtil.isNullOrEmpty(code)) {
			return R.error("拣货单据编码不能为空！！");
			}
			if (!mobileService.confirmFlatSheet(code)) {
			return R.error("出库失败！！");
			}
			return R.ok("出库成功！！");
			}


			/**
			* 获取播种位
			* @return
			*/
			@GetMapping("/pick/seed/locs")
			public R seedLocs() {
			List<CacheSite> sites = mobileService.getSeedLocs();
			return R.ok(sites);
			}

			/**
			* 订单绑定站点
			* @param param
			* @return
			*/
			@PostMapping("/pick/seed/bind")
			public R bindLoc(@RequestBody Map<String, Object> param) {
			if (Objects.isNull(param)) {
			throw new CoolException("请求参数不能为空！！");
			}
			if (Objects.isNull(param.get("barcode"))) {
			throw new CoolException("播种墙容器编码不能为空");
			}
			if (Objects.isNull(param.get("orderNo"))) {
			throw new CoolException("订单编号不能为空！！");
			}
			if (Objects.isNull(param.get("siteNo"))) {
			throw new CoolException("播种站点不能为空！！");
			}
			if (Objects.isNull(param.get("type"))) {
			throw new CoolException("参数类型不能为空！！");
			}
			boolean result = mobileService.bindOrderBySite(param);
			if (result) {
			return R.ok("绑定成功！！");
			} else {
			return R.error("绑定失败！！");
			}
			}


			/**
			* 获取发货订单明细
			* @return
			*/
			@PostMapping("/shipping/order/detl")
			public R getOrderDetl(@RequestBody Map<String, Object> params) {
			if (Objects.isNull(params)) {
			throw new CoolException("参数不能为空！！");
			}
			return mobileService.selectShippingDetl(params);
			}

			/**
			* 确认发货单明细
			* @return
			*/
			@PostMapping("/shipping/confirm")
			public R confirmShipping(@RequestBody List<ShippingOrderDetlDto> params) {
			if (params.isEmpty()) {
			throw new CoolException("发货单明细不能为空！！");
			}
			return mobileService.confirmShippingDetl(params);
			}



			}