package com.zy.asrs.controller;
|
|
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
import com.core.annotations.ManagerAuth;
|
import com.core.common.BaseRes;
|
import com.core.common.Cools;
|
import com.core.common.R;
|
import com.core.exception.CoolException;
|
import com.zy.asrs.entity.*;
|
import com.zy.asrs.entity.param.*;
|
import com.zy.asrs.entity.result.MobileAdjustResult;
|
import com.zy.asrs.mapper.ManLocDetlMapper;
|
import com.zy.asrs.service.*;
|
import com.zy.asrs.utils.SaasUtils;
|
import com.zy.common.model.WrkDto;
|
import com.zy.common.web.BaseController;
|
import com.zy.system.entity.User;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.web.bind.annotation.*;
|
|
import java.math.BigDecimal;
|
import java.text.ParseException;
|
import java.util.*;
|
|
/**
|
* 移动端接口控制器
|
* Created by vincent on 2020/6/10
|
*/
|
@RestController
|
@RequestMapping("mobile")
|
public class MobileController extends BaseController {
|
|
@Autowired
|
private MobileService mobileService;
|
@Autowired
|
private LocMastService locMastService;
|
@Autowired
|
private LocDetlService locDetlService;
|
@Autowired
|
private OrderService orderService;
|
@Autowired
|
private OrderDetlService orderDetlService;
|
@Autowired
|
private DocTypeService docTypeService;
|
@Autowired
|
private WrkMastService wrkMastService;
|
@Autowired
|
private WrkDetlService wrkDetlService;
|
@Autowired
|
private BasDevpService basDevpService;
|
@Autowired
|
private PackService packService;
|
@Autowired
|
private ManLocDetlMapper manLocDetlMapper;
|
@Autowired
|
private PlaService plaService;
|
@Autowired
|
private NodeService nodeService;
|
@Autowired
|
private OpenService openService;
|
|
|
// 商品上架
|
@RequestMapping("/mat/onSale/auth")
|
@ManagerAuth
|
public R matOnSale(@RequestBody CombParam combParam){
|
mobileService.onSale(combParam);
|
return R.ok("上架成功");
|
}
|
// 商品下架
|
@RequestMapping("/mat/offSale/auth")
|
//@ManagerAuth
|
public R matOffSale(@RequestBody OffSaleParam offSaleParam){
|
mobileService.offSale(offSaleParam);
|
return R.ok("下架成功");
|
}
|
|
|
|
// 组托 ----------------------------------------------------------------------------------------------------
|
|
/**
|
* 根据单号检索单据数据
|
* http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
|
*/
|
@RequestMapping("/order/search/orderNo/auth")
|
@ManagerAuth
|
public R orderSearchByBarcode(@RequestParam String orderNo){
|
Order order = orderService.selectByNo(orderNo);
|
if (order == null) {
|
return R.ok();
|
}
|
DocType docType = docTypeService.selectById(order.getDocType());
|
if (docType.getPakin() == null || docType.getPakin() != 1) {
|
return R.ok();
|
}
|
if (order.getSettle() > 2) {
|
return R.ok();
|
}
|
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
|
ArrayList<OrderDetl> orderDetls2 = new ArrayList<>();
|
for (OrderDetl orderDetl : orderDetls){
|
orderDetl.setAnfme(new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
|
orderDetl.setWorkQty(new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
|
orderDetl.setQty(new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
|
orderDetls2.add(orderDetl);
|
}
|
if (Cools.isEmpty(orderDetls) || Cools.isEmpty(orderDetls2)) {
|
return R.ok();
|
}
|
return R.ok().add(orderDetls2);
|
}
|
|
@RequestMapping("/comb/auth")
|
@ManagerAuth(memo = "组托")
|
public R comb(@RequestBody CombParam combParam){
|
mobileService.comb(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/pack/get/auth")
|
@ManagerAuth
|
public R packGet(@RequestParam String barcode){
|
Pack pack = packService.selectByBarcode(barcode);
|
if (pack == null) {
|
return R.ok();
|
}
|
if (pack.getSettle() == 1L) {
|
return R.ok().add(pack);
|
}
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/pack/comb/auth")
|
@ManagerAuth(memo = "下线组托")
|
public R packComb(@RequestBody CombParam combParam){
|
// mobileService.packComb(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
|
// 出库 ---------------------------------------------------------------------------------------------------
|
|
@RequestMapping("/pakout/query/auth")
|
@ManagerAuth
|
@Deprecated
|
public R pakoutQuery(@RequestParam(required = false) String barcode,
|
@RequestParam(required = false) Integer staNo,
|
@RequestParam(required = false) String matnr){
|
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
|
return R.ok();
|
}
|
if (!Cools.isEmpty(barcode)) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
|
return R.ok().add(wrkDetls);
|
}
|
if (!Cools.isEmpty(matnr)) {
|
if (!Cools.isEmpty(staNo)) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
|
return R.ok().add(wrkDetls);
|
}
|
}
|
return R.ok();
|
}
|
|
/**
|
* 出库确认 - 扫托盘码
|
* 1.全板 返回 101
|
* 2.拣料 返回 103
|
*/
|
@RequestMapping("/pakout/confirm/barcode/auth")
|
@ManagerAuth
|
public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
|
if (Cools.isEmpty(barcode)) {
|
return R.ok();
|
}
|
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
|
if (wrkMast != null) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
// 去除已出库确认的明细
|
wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
|
return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
|
}
|
return R.ok();
|
}
|
|
// 根据库位码和商品码搜索商品
|
@RequestMapping("/mat/find/auth")
|
public R find(@RequestParam(required = false) String locNo
|
, @RequestParam(required = false) String matnr){
|
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
|
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
|
return R.ok(manLocDetl);
|
//return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
|
}
|
|
/**
|
* 出库确认 - 拣料出库 - 选择具体条码商品
|
*/
|
@RequestMapping("/pakout/confirm/pick/auth")
|
@ManagerAuth
|
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
|
, @RequestParam(required = false) String matnr){
|
if (Cools.isEmpty(wrkNo)) {
|
return R.ok();
|
}
|
if (Cools.isEmpty(matnr)) {
|
return R.ok();
|
}
|
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
|
if (wrkMast == null) {
|
return R.ok();
|
}
|
String orderNo = null;
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
for (WrkDetl wrkDetl : wrkDetls) {
|
if (Cools.isEmpty(orderNo)) {
|
orderNo = wrkDetl.getOrderNo();
|
}
|
if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) {
|
return R.ok().add(wrkDetl);
|
}
|
}
|
// 替换 明细
|
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
|
for (LocDetl locDetl : locDetls) {
|
if ((locDetl.getMatnr() + "-" + locDetl.getBatch()).equals(matnr)) {
|
WrkDetl wrkDetl = new WrkDetl();
|
wrkDetl.sync(locDetl);
|
wrkDetl.setOrderNo(orderNo);
|
wrkDetl.setIoTime(wrkMast.getIoTime());
|
wrkDetl.setWrkNo(wrkNo);
|
return R.ok().add(wrkDetl);
|
}
|
}
|
return R.error("系统错误，条码不存在");
|
}
|
|
|
@RequestMapping("/pakout/confirm/auth")
|
@ManagerAuth
|
@Transactional
|
public R pakoutConfirm(@RequestBody List<WrkDetl> list) {
|
if (Cools.isEmpty(list)) {
|
return R.ok();
|
}
|
Set<Integer> wrkNos = new HashSet<>();
|
List<WrkDto> dtos = new ArrayList<>();
|
for (WrkDetl wrkDetl : list) {
|
if (wrkNos.contains(wrkDetl.getWrkNo())) {
|
for (WrkDto dto : dtos) {
|
if (dto.getWrkNo().equals(wrkDetl.getWrkNo())) {
|
dto.getWrkDetls().add(wrkDetl);
|
break;
|
}
|
}
|
} else {
|
wrkNos.add(wrkDetl.getWrkNo());
|
dtos.add(new WrkDto(wrkDetl.getWrkNo(), wrkDetl));
|
}
|
}
|
|
for (WrkDto dto : dtos) {
|
WrkMast wrkMast = wrkMastService.selectById(dto.getWrkNo());
|
if (wrkMast != null) {
|
// 101
|
if (wrkMast.getIoType() == 101) {
|
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
|
wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
|
}
|
}
|
// 103
|
if (wrkMast.getIoType() == 103) {
|
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
|
throw new CoolException("拣料出库确认失败");
|
}
|
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
|
wrkDetl.setInspect(1);
|
if (!wrkDetlService.insert(wrkDetl)) {
|
throw new CoolException("拣料出库确认失败");
|
}
|
}
|
}
|
}
|
}
|
|
for (Integer wrkNo : wrkNos) {
|
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
|
if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
|
boolean complete = true;
|
for (WrkDetl wrkDetl : wrkDetls) {
|
if (wrkDetl.getInspect() == null || wrkDetl.getInspect() == 0) {
|
complete = false;
|
break;
|
}
|
}
|
if (complete) {
|
wrkMast.setInvWh("Y");
|
wrkMast.setModiTime(new Date());
|
if (!wrkMastService.updateById(wrkMast)) {
|
throw new CoolException("修改工作档" + wrkNo + "失败");
|
}
|
}
|
}
|
}
|
return R.ok("完成确认");
|
}
|
|
|
// 盘点 ----------------------------------------------------------------------------------------------------
|
|
@RequestMapping("/checkDetl/auth")
|
@ManagerAuth
|
public R getCheckDetl(@RequestParam(required = false) Integer staNo) {
|
if (null == staNo || staNo == 0) {
|
return R.ok();
|
}
|
BasDevp basDevp = basDevpService.selectById(staNo);
|
if (null != basDevp && basDevp.getWrkNo() != null) {
|
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
|
if (wrkMast != null && wrkMast.getIoType() == 107) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
if (!Cools.isEmpty(wrkDetls)) {
|
MobileAdjustResult result = new MobileAdjustResult();
|
result.setStaNo(staNo);
|
result.setWrkNo(wrkMast.getWrkNo());
|
result.setWrkDetls(wrkDetls);
|
return R.ok().add(result);
|
}
|
}
|
}
|
return R.ok();
|
}
|
|
@RequestMapping("/adjust/auth")
|
@ManagerAuth(memo = "盘点")
|
public R adjust(@RequestBody MobileAdjustParam combParam){
|
mobileService.adjust(combParam, getUserId());
|
return R.ok("盘点成功");
|
}
|
|
@RequestMapping("/adjustNew/auth")
|
@ManagerAuth(memo = "pda盘点")
|
public R adjustNew(@RequestBody MobileAdjustNewParam combParam){
|
mobileService.adjustNew(combParam, getUserId());
|
return R.ok("盘点成功");
|
}
|
|
@PostMapping("/order/out/pakout/auth")
|
@ManagerAuth(memo = "订单出库")
|
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
|
if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
|
return R.parse(BaseRes.PARAM);
|
}
|
mobileService.pakoutByOrder(param,getUserId());
|
return R.ok("出库成功");
|
}
|
|
//平库pda上架
|
@RequestMapping("/manDetl/in")
|
@ManagerAuth(memo = "订单上架")
|
public R manDetlAdd(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlIn(json, getUser());
|
}
|
|
//平库pda下架
|
@RequestMapping("/manDetl/out")
|
@ManagerAuth(memo = "订单下架")
|
public R manDetlDelete(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlOut(json , getUser());
|
}
|
|
@RequestMapping("/manDetl/in/barcode")
|
@ManagerAuth(memo = "订单上架(托盘码)")
|
public R manDetlAddbarcode(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlInBarcode(json,getUser());
|
}
|
|
@RequestMapping("/manDetl/in/origin")
|
@ManagerAuth(memo = "平库上架")
|
public R manDetlIn(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlOrigin(json,getUser());
|
}
|
|
@RequestMapping("/manDetl/in/no/origin")
|
@ManagerAuth(memo = "平库上架")
|
public R manDetlInNo(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlOrigInNo(json,getUser());
|
}
|
|
// @RequestMapping("/manDetl/out/origin")
|
// @ManagerAuth(memo = "平库下架")
|
// public R manDetlout(@RequestBody JSONObject json){
|
// if (json == null){
|
// return R.error("传入数据为空");
|
// }
|
// return mobileService.manDetlOriginOut(json,getUser());
|
// }
|
|
@RequestMapping("/manDetl/out/origin")
|
@ManagerAuth(memo = "平库下架")
|
public R manDetlout2(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlOriginOut(json,getUser());
|
}
|
|
@RequestMapping("/plaDetl/packin/v1")
|
//@ManagerAuth(memo="pla入库")
|
@Transactional
|
public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
|
String locNo = json.get("locNo").toString();
|
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
|
for (Object o : jsonArray){
|
JSONObject jsonObject = (JSONObject)o;
|
String brand = jsonObject.get("brand").toString();
|
String batch = jsonObject.get("batch").toString();
|
Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
|
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
return R.error("有参数为空，无法入库");
|
}
|
//测试
|
if(true){
|
User user = new User();
|
user.setUsername("test");
|
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
|
}
|
}
|
//入库成功后上报ERP
|
//openService.pakinReportErp(json);
|
return R.ok("入库成功");
|
}
|
|
@RequestMapping("/plaDetl/packin/v2")
|
//@ManagerAuth(memo="pla入库")
|
@Transactional
|
public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
|
String locNo = json.get("locNo").toString();
|
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
|
for (Object o : jsonArray){
|
JSONObject jsonObject = (JSONObject)o;
|
String brand = jsonObject.get("brand").toString();
|
String batch = jsonObject.get("batch").toString();
|
Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
|
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
return R.error("有参数为空，无法入库");
|
}
|
//测试
|
if(true){
|
User user = new User();
|
user.setUsername("test");
|
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
|
}
|
}
|
//入库成功后上报ERP
|
openService.pakinReportErp(json);
|
return R.ok("入库成功");
|
}
|
|
@RequestMapping("/plaDetl/packout1/v1")
|
// @ManagerAuth(memo="pla出库")
|
public R plaPackOut1(@RequestBody JSONObject json){
|
String locNo = json.get("locNo").toString();
|
String brand = json.get("brand").toString();
|
String batch = json.get("batch").toString();
|
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
|
String orderNo = json.get("orderNo").toString();
|
String orderDetlId = json.get("orderDetlId").toString();
|
String wrkNo = json.get("wrkNo").toString();
|
Double anfme = Double.parseDouble(json.get("anfme").toString());
|
boolean isReplace = Cools.eq(json.get("replace").toString(),"y");
|
|
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
return R.error("有参数为空，无法入库");
|
}
|
|
mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme,isReplace);
|
return R.ok();
|
}
|
|
@RequestMapping("/plaDetl/packout/v1")
|
// @ManagerAuth(memo="pla出库")
|
public R plaPackOut(@RequestBody JSONObject json){
|
String locNo = json.get("locNo").toString();
|
String brand = json.get("brand").toString();
|
String batch = json.get("batch").toString();
|
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
|
String orderNo = json.get("orderNo").toString();
|
String plaQtyId = json.get("orderDetlId").toString();
|
String wrkNo = json.get("wrkNo").toString();
|
Double anfme = Double.parseDouble(json.get("anfme").toString());
|
boolean isReplace = !Cools.isEmpty(json.get("replace")) && Cools.eq(json.get("replace").toString(),"y");
|
|
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
return R.error("有参数为空，无法入库");
|
}
|
|
mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,plaQtyId,wrkNo,anfme,isReplace);
|
return R.ok();
|
}
|
|
/*
|
无订单拣货出库
|
*/
|
@RequestMapping("/plaDetl/packout/noOrder/v1")
|
//@ManagerAuth(memo="pla手动出库")
|
public R plaPackOutWithoutOrder(@RequestBody List<PlaParam> params){
|
|
for (PlaParam param : params){
|
mobileService.plaPackOutWithoutOrder(param.getBrand(),param.getBatch(),param.getPackageNo(),param.getAnfme());
|
}
|
|
return R.ok();
|
}
|
|
|
@RequestMapping("/plaDetl/check/v1")
|
public R plaDetlCheck(@RequestBody JSONObject json){
|
String brand = json.get("brand").toString();
|
String batch = json.get("batch").toString();
|
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
|
Integer type = Integer.parseInt(json.get("type").toString());
|
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
return R.error("有参数为空，无法入库");
|
}
|
|
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
|
if ((Cools.isEmpty(pla))){
|
return R.error("该包物料未录入，无法查询到相关信息").add(pla);
|
}
|
if(!(Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_00)) && type != 2){
|
return R.error("该包物料的状态为" + pla.getStatus() +"，无法进行入库操作").add(pla);
|
}
|
return R.ok(pla);
|
}
|
|
/*
|
pla移库
|
*/
|
@RequestMapping("/plaDetl/move/v1")
|
@ManagerAuth
|
public R plaDetlMove(@RequestBody PlaMoveParam param){
|
|
String locNo = param.getLocNo();
|
|
Node node = nodeService.selectByUuid(locNo);
|
if(Cools.isEmpty(node)){
|
throw new CoolException("库位信息不正确");
|
}
|
|
List<PlaMoveParam.PlaMove> plas = param.getPlas();
|
|
param.getPlas().forEach(p -> {
|
String brand = p.getBrand();
|
String batch = p.getBatch();
|
Integer packageNo = p.getPackageNo();
|
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
|
throw new CoolException("有参数为空，无法入库");
|
}
|
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
|
if ((Cools.isEmpty(pla))){
|
throw new CoolException("该包物料未录入，无法查询到相关信息");
|
}
|
if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)){
|
throw new CoolException("该包物料的状态为" + pla.getStatus() +"，无法进行入库操作");
|
}
|
|
String sourceLocNo = pla.getLocNo();
|
pla.setLocNo(locNo);
|
pla.setStash(node.getParentName());
|
pla.setModifyTime(new Date());
|
|
plaService.updateById(pla);
|
SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
|
locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
|
|
});
|
|
return R.ok("移库成功");
|
}
|
|
/*
|
根据拣货单出库 ------> 获取拣货单
|
*/
|
@RequestMapping("/manpakout/check/v1")
|
public R getManPakout (@RequestBody JSONObject json){
|
|
String orderNo = json.get("orderNo").toString();
|
|
return R.ok(mobileService.getManPakoutByOrderNo(orderNo));
|
}
|
|
@RequestMapping("/manpakout/pakout/v1")
|
public R pakout(@RequestBody JSONObject json){
|
|
String batch = json.get("batch").toString();
|
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
|
String orderNo = json.get("orderNo").toString();
|
|
|
|
return R.ok();
|
}
|
@RequestMapping("select/mat/information/v1")
|
@ManagerAuth
|
public R pdaSelectInformation(@RequestParam String barcode){
|
List<Pla> locDetls = mobileService.pdaSelectInfmt(barcode);
|
return R.ok(locDetls);
|
}
|
|
|
public static void main(String[] args) {
|
// String aa = "[{\"batch\":\"2023090304\",\"packageNo\":\"8\"},{\"batch\":\"2023090304\",\"packageNo\":\"8\"}]";
|
// JSONArray jsonArray = JSON.parseArray(aa);
|
// Object o = jsonArray.get(0);
|
// System.out.println(o.toString());
|
// JSONObject jsonObject = (JSONObject)o;
|
// System.out.println(jsonObject);
|
|
String s = "2024010502";
|
System.out.println(s.substring(8,10));
|
|
Object s1 = "8";
|
System.out.println(Integer.parseInt(s1.toString()));
|
}
|
|
}
|
