diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java index b231baa..21d9cfa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java @@ -103,4 +103,6 @@ public class BasCargoSpaceController extends BaseController { return toAjax(basCargoSpaceService.deleteBasCargoSpaceByCargoSpaceIds(cargoSpaceIds)); } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java index 730863d..e1433a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java @@ -60,4 +60,6 @@ public interface BasCargoSpaceMapper extends BaseMapper * @return 结果 */ public int deleteBasCargoSpaceByCargoSpaceIds(String[] cargoSpaceIds); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java index deee496..49e8aca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java @@ -60,4 +60,6 @@ public interface IBasCargoSpaceService extends IService * @return 结果 */ public int deleteBasCargoSpaceByCargoSpaceId(String cargoSpaceId); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java index 680d8ae..96583ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.sql.Wrapper; +import java.util.Collections; import java.util.List; /** @@ -95,4 +96,6 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl detailList = checkStockVo.getDetailList(); - String stockCheckId = basJobIdService.getJobId("CKD"); + String stockCheckId = basJobIdService.getJobId("PDD"); checkStockin.setStockCheckId(stockCheckId); checkStockin.setStockGuid(IdUtil.simpleUUID()); checkStockin.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - String username = SecurityContextHolder.getContext().getAuthentication().getName(); - checkStockin.setCreateManId(username); + checkStockin.setCreateManId(SecurityUtils.getUsername()); + checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId())); checkStockin.setStatus("1"); checkStockin.setStockSource("0"); checkStockin.setCheckType(checkStockin.getCheckType()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java index e779c05..65a543c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java @@ -45,11 +45,7 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java index b7b39bc..9596338 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java @@ -97,10 +97,6 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java index 48537b6..b3b1a41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java @@ -60,4 +60,6 @@ public interface InStockinMapper public int deleteInStockinByStockinGuids(String[] stockinGuids); void insertInStockinHistory(InStockin inStockin); + + List selectStockinByDetail(String stockinDetailId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java index a9f73e8..fb5276c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java @@ -60,4 +60,6 @@ public interface IInStockinService * @return 结果 */ public int deleteInStockinByStockinGuid(String stockinGuid); + + public List selectStockinByDetail(String stockinDetailId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index ebeccb9..c591742 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.in.stockin.service.impl; import java.util.Arrays; +import java.util.Collections; import java.util.List; import cn.hutool.core.collection.CollUtil; @@ -116,6 +117,7 @@ public class InStockinServiceImpl implements IInStockinService * @param inStockin */ private void insertInStockinHistory(InStockin inStockin) { + inStockin = selectInStockinByStockinGuid(inStockin.getStockinGuid()); //插入历史单据 inStockinMapper.insertInStockinHistory(inStockin); iInStockinDetailService.insertInStockinDetailHistory(inStockin); @@ -146,4 +148,9 @@ public class InStockinServiceImpl implements IInStockinService { return inStockinMapper.deleteInStockinByStockinGuid(stockinGuid); } + + @Override + public List selectStockinByDetail(String stockinDetailId) { + return inStockinMapper.selectStockinByDetail(stockinDetailId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index 248e913..fdacc26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -46,11 +46,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { + /*for (InStockinDetail res : inStockinDetails) { res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + }*/ + return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java index c196f9e..da82b7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java @@ -97,11 +97,8 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + + return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java index bfe8514..588e4fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java @@ -46,11 +46,11 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail) { List mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail); - for (MydoJobDetail jobDetail : mydoJobDetails) { + /*for (MydoJobDetail jobDetail : mydoJobDetails) { if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); } - } + }*/ return mydoJobDetails; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java index c1cfe24..128b96e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java @@ -54,11 +54,11 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi String jobId = mydoJobDetail.getJobId(); List mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId); - for (MydoJobDetail jobDetail : mydoJobDetails) { + /*for (MydoJobDetail jobDetail : mydoJobDetails) { if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); } - } + }*/ return mydoJobDetails; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java index 28bb073..c93a929 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 可出库的库存物资信息对象 view_product_and_stock - * + * * @author ruoyi * @date 2025-05-21 */ @@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; - public void setOnlyIdentity(Long onlyIdentity) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public void setOnlyIdentity(Long onlyIdentity) { this.onlyIdentity = onlyIdentity; } - public Long getOnlyIdentity() + public Long getOnlyIdentity() { return onlyIdentity; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index 9e137bf..2017479 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -1,5 +1,9 @@ package com.ruoyi.pda.controller; +import cn.hutool.core.util.StrUtil; +import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; +import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -7,12 +11,15 @@ import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockin.service.IInStockinService; import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.service.PdaService; -import io.swagger.v3.oas.annotations.parameters.RequestBody; +import com.ruoyi.stock.stock.domain.BasStock; +import com.ruoyi.stock.stock.service.IBasStockService; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.HashMap; import java.util.List; import static com.ruoyi.common.utils.PageUtils.startPage; @@ -25,6 +32,10 @@ public class PdaController extends BaseController { private PdaService pdaService; @Autowired private IInStockinService inStockinService; + @Autowired + private IBasStockService basStockService; + @Autowired + private IBasWarehouseService basWarehouseService; /** * 空托盘入库 @@ -34,8 +45,16 @@ public class PdaController extends BaseController { @RequestMapping("/emptyTrayIn") @ResponseBody public AjaxResult emptyTrayIn(@RequestBody TrayCodeMsg trayCodeMsg) { - AjaxResult ajaxResult = pdaService.emptyTrayIn(trayCodeMsg); - return ajaxResult; + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId()); + if(basWarehouse==null){ + return AjaxResult.error("仓库不存在"); + }else{ + if("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())){ + return AjaxResult.error("请选择高架库货位"); + } + + } + return pdaService.emptyTrayIn(trayCodeMsg); } /** @@ -48,12 +67,61 @@ public class PdaController extends BaseController { return ajaxResult; } + /** + * 空托盘库存查询 + * @param warehouseId + * @return + */ + @RequestMapping("/selectKTPStcok") + @ResponseBody + public AjaxResult selectKTPStcok(String warehouseId) { + + List basStockList = basStockService.selectKtpStock(warehouseId); + + if (basStockList.size() != 0) { + return AjaxResult.success(basStockList); + }else{ + return AjaxResult.error("此区域没有空托盘库存"); + } + + } + + /** + * 空托盘出库 + * @param + * @return + */ + @RequestMapping("/emptyTrayOut") + @ResponseBody + public AjaxResult emptyTrayOut(@RequestBody TrayCodeMsg trayCodeMsg ) { + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId()); + if (basWarehouse == null){ + return AjaxResult.error("仓库不存在"); + }else{ + if("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())){ + return AjaxResult.error("请选择高架库货位"); + } + } + return pdaService.emptyTrayOut(trayCodeMsg); + } + + /** + * 空料箱出库 + * @param trayCodeMsg + * @return + */ + @RequestMapping("/emptyBoxOut") + @ResponseBody + public AjaxResult emptyBoxOut(@RequestBody TrayCodeMsg trayCodeMsg) { + return pdaService.emptyBoxOut(trayCodeMsg); + } + + @RequestMapping("/inorder/list") @ResponseBody - public TableDataInfo inoderList(InStockin stockin) { - startPage(); - List stockins = inStockinService.selectInStockinList(stockin); - return getDataTable(stockins); + public List inoderList(String stockinDetailId) { + List stockins = inStockinService.selectStockinByDetail(stockinDetailId); + return stockins; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java index ca1e13a..7f745af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java @@ -10,6 +10,26 @@ private String quantity; private String entranceId; +private String cargoSpaceId; + +private String exitId; + + public String getExitId() { + return exitId; + } + + public void setExitId(String exitId) { + this.exitId = exitId; + } + + public String getCargoSpaceId() { + return cargoSpaceId; + } + + public void setCargoSpaceId(String cargoSpaceId) { + this.cargoSpaceId = cargoSpaceId; + } + public String getEntranceId() { return entranceId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java index 803b630..70e93d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java @@ -7,4 +7,8 @@ public interface PdaMapper { void emptyTrayIn(HashMap map); void emptyBoxIn(HashMap map); + + void emptyTrayOut(HashMap map); + + void emptyBoxOut(HashMap map); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java index 0ec8c97..20e2f35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java @@ -2,10 +2,15 @@ package com.ruoyi.pda.service; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.pda.domain.TrayCodeMsg; +import org.apache.poi.ss.formula.functions.T; public interface PdaService { public AjaxResult emptyTrayIn(TrayCodeMsg trayCodeMsg); public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg); + + public AjaxResult emptyTrayOut(TrayCodeMsg trayCodeMsg); + + public AjaxResult emptyBoxOut(TrayCodeMsg trayCodeMsg); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index e7eec99..f26aaf1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -28,15 +28,11 @@ public class PdaServiceImp implements PdaService{ map.put("v_tray_code", trayCodeMsg.getTrayCode()); map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); map.put("v_quantity", "1"); + map.put("v_cargo_space_id", trayCodeMsg.getCargoSpaceId()); pdaMapper.emptyTrayIn(map); - String result = (String) map.get("v_result"); - String cargoSpaceId = map.get("v_cargo_space_id").toString(); - if(StrUtil.isNotEmpty(cargoSpaceId)){ - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId); - map.put("v_cargo_space_id", basCargoSpace.getCargoSpaceName()); - } + String result = map.get("v_result").toString(); if("10".equals(result)){ - return AjaxResult.success(map); + return AjaxResult.success(map.get("v_resultmsg").toString()); }else{ return AjaxResult.error(map.get("v_resultmsg").toString()); } @@ -52,9 +48,10 @@ public class PdaServiceImp implements PdaService{ public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg) { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); map.put("v_entrance_id", trayCodeMsg.getEntranceId()); pdaMapper.emptyBoxIn(map); - String result = (String) map.get("v_result"); + String result = map.get("v_result").toString(); if("10".equals(result)){ return AjaxResult.success(map.get("v_resultmsg").toString()); }else{ @@ -63,5 +60,32 @@ public class PdaServiceImp implements PdaService{ } + @Override + public AjaxResult emptyTrayOut(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); + map.put("v_cargo_space_id", trayCodeMsg.getCargoSpaceId()); + pdaMapper.emptyTrayOut(map); + String result = map.get("v_result").toString(); + if("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.warn(map.get("v_resultmsg").toString()); + } + } + + @Override + public AjaxResult emptyBoxOut(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); + map.put("v_exit_id", trayCodeMsg.getExitId()); + pdaMapper.emptyBoxOut(map); + String result = map.get("v_result").toString(); + if("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.warn(map.get("v_resultmsg").toString()); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java index 9071e4f..4e3dfa7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java @@ -48,11 +48,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java index 45a0230..6b6de0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java @@ -98,10 +98,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail res : receiveStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java index 0def9d6..9dd3d0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java @@ -60,4 +60,6 @@ public interface BasStockMapper public int deleteBasStockByStockIds(String[] stockIds); void insertBasStockList(List list); + + List selectKtpStock(String warehouseId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java index 8048f50..d686833 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java @@ -62,4 +62,6 @@ public interface IBasStockService public int deleteBasStockByStockId(String stockId); void insertBasStockList(List list); + + List selectKtpStock(String warehouseId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index e534ff1..171030a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -175,5 +175,8 @@ public class BasStockServiceImpl implements IBasStockService basStockMapper.insertBasStockList(list); } - + @Override + public List selectKtpStock(String warehouseId) { + return basStockMapper.selectKtpStock(warehouseId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java index ace9f50..c01d532 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java @@ -2,6 +2,8 @@ package com.ruoyi.work.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.annotation.Anonymous; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 出库未完成任务Controller - * + * * @author gw * @date 2025-06-04 */ @@ -37,7 +39,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询已完成入库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list1')") + @Anonymous @GetMapping("/list1") public TableDataInfo list1(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -49,7 +51,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询已完成出库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list2')") + @Anonymous @GetMapping("/list2") public TableDataInfo list2(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -61,7 +63,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询未完成入库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list3')") + @Anonymous @GetMapping("/list3") public TableDataInfo list3(ViewNoDoneOutWork viewNoDoneOutWork) { @@ -73,7 +75,7 @@ public class ViewNoDoneOutWorkController extends BaseController /** * 查询未完成出库任务列表 */ - @PreAuthorize("@ss.hasPermi('work:list4')") + @Anonymous @GetMapping("/list4") public TableDataInfo list4(ViewNoDoneOutWork viewNoDoneOutWork) { diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml index 410b4ce..2ba6c5c 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml @@ -140,4 +140,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{cargoSpaceId} + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml index 7c45664..fbfb2a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml @@ -67,10 +67,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail_finish csd + left join bas_product bp on csd.product_id = bp.product_id @@ -119,34 +136,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="CheckStockinDetailResult"> - and stock_check_guid = #{stockCheckGuid} - and stock_check_id = #{stockCheckId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and csd.stock_check_guid = #{stockCheckGuid} + and csd.stock_check_id = #{stockCheckId} + and csd.lot_no = #{lotNo} + and csd.product_guid = #{productGuid} + and csd.product_id = #{productId} + and csd.quantity = #{quantity} + and csd.quantity_x = #{quantityX} + and csd.quantity_j = #{quantityJ} + and csd.price = #{price} + and csd.cargo_no = #{cargoNo} + and csd.assign_num = #{assignNum} + and csd.assign_num_x = #{assignNumX} + and csd.assign_num_j = #{assignNumJ} + and csd.print_date = #{printDate} + and csd.stock_status = #{stockStatus} + and csd.supplier_id = #{supplierId} + and csd.customer_id = #{customerId} + and csd.unit = #{unit} + and csd.spec = #{spec} + and csd.scan_num = #{scanNum} + and csd.scan_num_x = #{scanNumX} + and csd.scan_num_j = #{scanNumJ} + and csd.spare1 = #{spare1} + and csd.spare2 = #{spare2} + and csd.spare3 = #{spare3} + and csd.spare4 = #{spare4} + and csd.spare5 = #{spare5} + and csd.spare6 = #{spare6} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 1c9d3b4..f62a1c0 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -35,43 +35,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail csd + left join bas_product bp on csd.product_id = bp.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml index d2c6eff..734d948 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml @@ -45,9 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 + from check_stockin_finish csf + left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish @@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_date = #{createDate} and create_man_id = #{createManId} and status = #{status} - and warehouse_id = #{warehouseId} + and csf.warehouse_id = #{warehouseId} and finish_date = #{finishDate} and erp_bill = #{erpBill} and stock_source = #{stockSource} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml index 623f79e..ef79447 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml @@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 , + bw.warehouse_name + from check_stockin cs + left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} @@ -114,34 +133,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="InStockinDetailResult"> - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 8da7d75..b9180fa 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -35,14 +35,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid, - isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark, - assign_num, assign_num_x, assign_num_j, print_date, stock_status, - supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, - isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j + select + isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, + isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume from in_stockin_detail isd left join bas_product bp on bp.product_id = isd.product_id @@ -50,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml index 7fff78f..cf9eb93 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml @@ -188,4 +188,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockinGuid} + + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index a1c2c71..3383327 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -31,41 +31,81 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail_finish - + select mjd.job_detail_id, + mjd.job_id, + mjd.stock_id, + mjd.lot_no, + mjd.in_date, + mjd.in_or_out_id, + mjd.in_or_out_d_id, + mjd.product_guid, + mjd.product_id, + mjd.stock_status, + mjd.in_quantity, + mjd.stock_quantity, + mjd.out_quantity, + mjd.layer_quantity, + mjd.out_layer_quantity, + mjd.give_num, + mjd.stockin_id, + mjd.stacking_id, + mjd.exit_id, + mjd.print_date, + mjd.customer_id, + mjd.supplier_id, + mjd.spare1, + mjd.spare2, + mjd.spare3, + mjd.spare4, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + + from mydo_job_detail_finish mjd + left join bas_product bp on mjd.product_id = bp.product_id + @@ -73,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} - + - and job_detail_id = #{jobDetailId} - and job_id = #{jobId} - and stock_id = #{stockId} - and lot_no = #{lotNo} - and in_date = #{inDate} - and in_or_out_id = #{inOrOutId} - and in_or_out_d_id = #{inOrOutDId} - and product_guid = #{productGuid} - and product_id = #{productId} - and stock_status = #{stockStatus} - and in_quantity = #{inQuantity} - and stock_quantity = #{stockQuantity} - and out_quantity = #{outQuantity} - and layer_quantity = #{layerQuantity} - and out_layer_quantity = #{outLayerQuantity} - and give_num = #{giveNum} - and stockin_id = #{stockinId} - and stacking_id = #{stackingId} - and exit_id = #{exitId} - and print_date = #{printDate} - and customer_id = #{customerId} - and supplier_id = #{supplierId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} + and mjd.job_detail_id = #{jobDetailId} + and mjd.job_id = #{jobId} + and mjd.stock_id = #{stockId} + and mjd.lot_no = #{lotNo} + and mjd.in_date = #{inDate} + and mjd.in_or_out_id = #{inOrOutId} + and mjd.in_or_out_d_id = #{inOrOutDId} + and mjd.product_guid = #{productGuid} + and mjd.product_id = #{productId} + and mjd.stock_status = #{stockStatus} + and mjd.in_quantity = #{inQuantity} + and mjd.stock_quantity = #{stockQuantity} + and mjd.out_quantity = #{outQuantity} + and mjd.layer_quantity = #{layerQuantity} + and mjd.out_layer_quantity = #{outLayerQuantity} + and mjd.give_num = #{giveNum} + and mjd.stockin_id = #{stockinId} + and mjd.stacking_id = #{stackingId} + and mjd.exit_id = #{exitId} + and mjd.print_date = #{printDate} + and mjd.customer_id = #{customerId} + and mjd.supplier_id = #{supplierId} + and mjd.spare1 = #{spare1} + and mjd.spare2 = #{spare2} + and mjd.spare3 = #{spare3} + and mjd.spare4 = #{spare4} + - + and only_identity = #{onlyIdentity} and product_id = #{productId} and lot_no like concat('%', #{lotNo}, '%') @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and warehouse_id = #{warehouseId} - + - + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml index 4faa1e3..c14cb0a 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml @@ -61,40 +61,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail_finish rsd + left join bas_product bp on rsd.product_id = bp.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml index fdf6e91..7dd1219 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml @@ -32,41 +32,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail rsd + left join bas_product bp on rsd.product_id = bp.product_id + select b.cargo_space_name, b.cargo_space_id from bas_stock s,bas_cargo_space b where s.warehouse_id=#{warehouseId} + and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and s.product_id='KTP0001' + order by b.the_platoon,b.the_floor,b.the_column asc + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index f9627a3..ac59916 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -97,35 +97,35 @@ public class SecurityConfig protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { return httpSecurity - // CSRF禁用，因为不使用session - .csrf(csrf -> csrf.disable()) - // 禁用HTTP响应标头 - .headers((headersCustomizer) -> { - headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin()); - }) - // 认证失败处理类 - .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler)) - // 基于token，所以不需要session - .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - // 注解标记允许匿名访问的url - .authorizeHttpRequests((requests) -> { - permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); - // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage").permitAll() - // 静态资源，可匿名访问 - .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html","/changeLanguage", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() - // 除上面外的所有请求全部需要鉴权认证 - .anyRequest().authenticated(); - }) - // 添加Logout filter - .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler)) - // 添加JWT filter - .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) - // 添加CORS filter - .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class) - .addFilterBefore(corsFilter, LogoutFilter.class) - .build(); + // CSRF禁用，因为不使用session + .csrf(csrf -> csrf.disable()) + // 禁用HTTP响应标头 + .headers((headersCustomizer) -> { + headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin()); + }) + // 认证失败处理类 + .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler)) + // 基于token，所以不需要session + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + // 注解标记允许匿名访问的url + .authorizeHttpRequests((requests) -> { + permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); + // 对于登录login 注册register 验证码captchaImage 允许匿名访问 + requests.antMatchers("/login", "/register", "/captchaImage").permitAll() + // 静态资源，可匿名访问 + .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() + .antMatchers("/swagger-ui.html","/changeLanguage", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/pda/**").permitAll() + // 除上面外的所有请求全部需要鉴权认证 + .anyRequest().authenticated(); + }) + // 添加Logout filter + .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler)) + // 添加JWT filter + .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) + // 添加CORS filter + .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class) + .addFilterBefore(corsFilter, LogoutFilter.class) + .build(); } /** diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 2dee5c3..a93e360 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -354,7 +354,8 @@ export default { selectMaterialRequired: 'Please select material', materialExistWarning: 'Selected material already exists, please reselect', quantityExceedError: 'Quantity cannot exceed stock quantity', - saveSuccess: 'Document {msg} saved successfully' + saveSuccess: 'Document {msg} saved successfully', + lotNo:'lotNo', }, //***************盘点单据管理*************** checkStockCheck: { diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index fa87d88..ec55dfd 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -119,7 +119,7 @@ export default { stockStatus: '单据状态', operate: '操作', netWeight: '净重', - totalPrice: '确定', + totalPrice: '总价格', totalNetWeight: '总净重', grossWeight: '毛重', }, @@ -358,7 +358,8 @@ export default { selectMaterialRequired: '请选择物资', materialExistWarning: '所选物资已存在，请重新选择', quantityExceedError: '数量不能大于库存数量', - saveSuccess: '单据{msg}保存成功' + saveSuccess: '单据{msg}保存成功', + lotNo:'批次号', }, //***************盘点单据管理*************** checkStockCheck: { @@ -375,7 +376,7 @@ export default { invalidate: '单据作废', review: '单据审核', confirm: '单据确认', - warehouseId: '仓库ID', + warehouseId: '仓库', stockSource: '单据来源', departmentNo: '部门编码', createManId: '创建人', @@ -1882,12 +1883,12 @@ export default { Property: '属性', Value: '值', RAM: '内存', - + cores: '核心数', userUsageRate: '用户使用率', systemUsageRate: '系统使用率', idleRate: '当先空闲率', - + swap: 'Swap', os: 'OS', host: 'Host', diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 9862efd..c7782ba 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -2,7 +2,7 @@
- + - + + - + @@ -228,8 +228,8 @@ - - + + diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue index ecbb1be..1067c15 100644 --- a/ruoyi-ui/src/views/in/receive/index.vue +++ b/ruoyi-ui/src/views/in/receive/index.vue @@ -231,8 +231,7 @@ - - + --> + + - + - - + + - - -