|
@@ -9,6 +9,9 @@ import javax.annotation.Resource;
|
|
|
|
|
|
import com.lote.wms.base.product.entity.resultvo.ProductBarcodeResultVo;
|
|
|
import com.lote.wms.common.utils.BeanUtil;
|
|
|
+import com.lote.wms.outstock.order.entity.OutOrder;
|
|
|
+import com.lote.wms.outstock.wave.entity.OutWave;
|
|
|
+import com.lote.wms.outstock.wave.entity.expend.OutWaveExpand;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -310,6 +313,38 @@ public class AppServiceImpl implements AppService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public Message batchOutShelf3(AppRequest request, User user) {
|
|
|
+ String waveNo = request.getMsg();
|
|
|
+
|
|
|
+ Message message = new Message();
|
|
|
+ message.setSuccess(false);
|
|
|
+ if (StringUtil.isEmpty(waveNo)) {
|
|
|
+ message.setMsg("波次号不能为空!");
|
|
|
+ return message;
|
|
|
+ }
|
|
|
+ // 1.查询波次
|
|
|
+ boolean isExist = outWaveService.isExist(waveNo);
|
|
|
+ if (!isExist) {
|
|
|
+ // 如果波次号不存在,判断运单是否存在
|
|
|
+ message = outOrderService.selectByNo(waveNo);
|
|
|
+ if (!message.isSuccess()) {
|
|
|
+ return Message.fail("该波次单号或运单号不存在");
|
|
|
+ }
|
|
|
+ OutOrder order = (OutOrder) message.getExtend();
|
|
|
+ waveNo=order.getWaveNo();
|
|
|
+ }
|
|
|
+ OutWave outWave = outWaveService.getByWaveNo(waveNo);
|
|
|
+ if (outWave == null) {
|
|
|
+ return Message.fail("该波次单号不存在");
|
|
|
+ }
|
|
|
+ message.setSuccess(true);
|
|
|
+ OutWaveExpand printDetail = outWaveService.getPrintDetail(outWave.getId());
|
|
|
+
|
|
|
+ message.setExtend(printDetail);
|
|
|
+ return message;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public Message batchOutShelfPick1(AppRequest request, User user) {
|
|
|
return outWaveService.selectForSorting(request.getMsg());
|
|
|
}
|