diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java new file mode 100644 index 00000000..e9111005 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java @@ -0,0 +1,36 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.material.domain.PutInStorageBean; +import com.bonus.sgzb.material.service.InventoryAndWarehousingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:28 +*/ +@Api(tags = " 入库盘点") +@RestController +@RequestMapping("/inventoryAndWarehousing") +public class InventoryAndWarehousingController extends BaseController { + @Autowired + private InventoryAndWarehousingService inventoryAndWarehousingService; + + /** + * 查询入库盘点列表 + */ + @ApiOperation(value = "获取入库盘点列表") + @GetMapping("/getList") + public TableDataInfo getList(PutInStorageBean bean) { + startPage(); + List list = inventoryAndWarehousingService.getList(bean); + return getDataTable(list); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java new file mode 100644 index 00000000..b240ee45 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java @@ -0,0 +1,88 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 16:30 +*/ +@Data +public class PutInStorageBean extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + @ApiModelProperty(value = "id") + private Integer id; + + /** 入库形式 */ + @ApiModelProperty(value = "入库形式") + private String putInType; + + /** 入库数量 */ + @ApiModelProperty(value = "入库数量") + private BigDecimal num; + + /** 创建者 */ + @ApiModelProperty(value = "创建者") + private Integer creator; + + /** 入库人 */ + @ApiModelProperty(value = "入库人") + private String userName; + + /** 盘点入库单号 */ + @ApiModelProperty(value = "盘点入库单号") + private String code; + + /** 单位ID */ + @ApiModelProperty(value = "单位ID") + private String unitId; + + /** 单位名称 */ + @ApiModelProperty(value = "单位名称") + private String unitName; + + /** 工程ID */ + @ApiModelProperty(value = "工程ID") + private String projectId; + + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String projectName; + + /** 创建日期 */ + @ApiModelProperty(value = "创建日期") + private String createDate; + + /** 备注 */ + @ApiModelProperty(value = "备注") + private String remarks; + + + /** 主信息 */ + @ApiModelProperty(value = "主信息") + private Integer info; + + /** 库房 */ + @ApiModelProperty(value = "库房") + private Integer ram; + + /** 设备工器具类型 */ + @ApiModelProperty(value = "设备工器具类型") + private Integer type; + + /** 设备工器具类型名称 */ + @ApiModelProperty(value = "设备工器具类型名称") + private String typeName; + + /** 设备主键 */ + @ApiModelProperty(value = "设备主键") + private Integer machine; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java new file mode 100644 index 00000000..1b0a8047 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java @@ -0,0 +1,23 @@ +package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.material.domain.PutInStorageBean; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:33 +*/ +@Mapper +public interface InventoryAndWarehousingMapper { + + /** + * 查询入库盘点列表 + * @param bean + * @return 结果 + */ + List getList(PutInStorageBean bean); + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java new file mode 100644 index 00000000..1f4eab8c --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java @@ -0,0 +1,21 @@ +package com.bonus.sgzb.material.service; + + +import com.bonus.sgzb.material.domain.PutInStorageBean; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:31 +*/ +public interface InventoryAndWarehousingService { + + /** + * 查询入库盘点列表 + * @param bean + * @return 结果 + */ + List getList(PutInStorageBean bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java new file mode 100644 index 00000000..974a1d22 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java @@ -0,0 +1,26 @@ +package com.bonus.sgzb.material.service.impl; + +import com.bonus.sgzb.material.domain.PutInStorageBean; +import com.bonus.sgzb.material.mapper.InventoryAndWarehousingMapper; +import com.bonus.sgzb.material.service.InventoryAndWarehousingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:32 +*/ +@Service +public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousingService { + + @Autowired + private InventoryAndWarehousingMapper inventoryAndWarehousingMapper; + + @Override + public List getList(PutInStorageBean bean) { + return inventoryAndWarehousingMapper.getList(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml new file mode 100644 index 00000000..3f06814d --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index e031c340..e291ad56 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -227,12 +227,42 @@ export function getLeaseApplyAuditListAll(query) { } - - - - - - +//领料出库 列表 +export function getLeaseAuditList(query) { + return request({ + url: '/base/tm_task/getLeaseAuditList', + method: 'get', + params: query + }) +} + + +//领料出库 详情 +export function getLeaseAuditListDetail(query) { + return request({ + url: '/base/tm_task/getLeaseAuditListDetail', + method: 'get', + params: query + }) +} + +//领料出库 编码出库获取编码 +export function getDetailsByTypeId(query) { + return request({ + url: '/base/leaseOutDetails/getDetailsByTypeId', + method: 'get', + params: query + }) +} + +// 领料出库 编码出库 保存 +export function submitOut(params){ + return request({ + url: '/base/leaseOutDetails/submitOut', + method: 'post', + data: params + }) +} diff --git a/sgzb-ui/src/utils/dict/Dict.js b/sgzb-ui/src/utils/dict/Dict.js index 88ec49de..8fb6ca0f 100644 --- a/sgzb-ui/src/utils/dict/Dict.js +++ b/sgzb-ui/src/utils/dict/Dict.js @@ -77,7 +77,7 @@ function loadDict(dict, dictMeta) { dicts.forEach(d => { Vue.set(dict.label[type], d.value, d.label) }) - console.log(dict) + // console.log(dict) return dicts }) } diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js index 2b906e1c..c5a6e866 100644 --- a/sgzb-ui/src/utils/globalUrl.js +++ b/sgzb-ui/src/utils/globalUrl.js @@ -1,8 +1,8 @@ -// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试 -const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆 +const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试 +// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 - +// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue index 4f14cf60..cf7d9261 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue @@ -1,10 +1,10 @@ + + \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue new file mode 100644 index 00000000..c84a2847 --- /dev/null +++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue @@ -0,0 +1,408 @@ + + + + + \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue index a862381f..0681fd66 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue @@ -179,11 +179,11 @@ export default { equipmentTypeTree().then(response => { this.equipmentTypeList = response.data; this.equipmentTypeList.forEach((item,index)=>{ - if(item.children.length>0){ + if(item.children&&item.children.length>0){ item.children.forEach((item2,index2)=>{ - if(item2.children.length>0){ + if(item2.children&&item2.children.length>0){ item2.children.forEach(item3=>{ - if(item3.children.length>0){ + if(item3.children&&item3.children.length>0){ item3.children.forEach(item4=>{ item4.machineTypeName = item3.typeName item4.specificationType = item4.typeName diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue index 78066af2..3494c5ea 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue @@ -177,11 +177,11 @@ export default { equipmentTypeTree().then(response => { this.equipmentTypeList = response.data; this.equipmentTypeList.forEach((item,index)=>{ - if(item.children.length>0){ + if(item.children&&item.children.length>0){ item.children.forEach((item2,index2)=>{ - if(item2.children.length>0){ + if(item2.children&&item2.children.length>0){ item2.children.forEach(item3=>{ - if(item3.children.length>0){ + if(item3.children&&item3.children.length>0){ item3.children.forEach(item4=>{ item4.machineTypeName = item3.typeName item4.specificationType = item4.typeName diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue index 08472ecb..a95fea34 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue @@ -362,16 +362,14 @@ export default { equipmentTypeTree().then(response => { this.equipmentTypeList = response.data; this.equipmentTypeList.forEach((item,index)=>{ - if(item.children.length>0){ + if(item.children&&item.children.length>0){ item.children.forEach((item2,index2)=>{ - if(item2.children.length>0){ + if(item2.children&&item2.children.length>0){ item2.children.forEach(item3=>{ - if(item3.children.length>0){ + if(item3.children&&item3.children.length>0){ item3.children.forEach(item4=>{ item4.machineTypeName = item3.typeName item4.specificationType = item4.typeName - // item4.purchasePrice = 1 - // item4.purchaseNum = 1 this.$set(item4, 'purchasePrice', 0); this.$set(item4, 'purchaseNum', 1); }) diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue index 94fa2651..3f463279 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue @@ -373,14 +373,10 @@ export default { item.children.forEach((item2,index2)=>{ if(item2.children&&item2.children.length>0){ item2.children.forEach(item3=>{ - // console.log(item3,'item3') if(item3.children&&item3.children.length>0){ item3.children.forEach(item4=>{ - // console.log(item4,'item4') item4.machineTypeName = item3.typeName item4.specificationType = item4.typeName - // item4.purchasePrice = 1 - // item4.purchaseNum = 1 this.$set(item4, 'purchasePrice', 0); this.$set(item4, 'purchaseNum', 1); }) diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 2cecc9fa..57811dcf 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -18,7 +18,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/" : "/",///gl/ // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） @@ -40,9 +40,9 @@ module.exports = { // target: `http://192.168.0.14:21624`,//线上环境/ // target: `http://1.12.248.179:23028`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 - target: `https://z.csgmall.com.cn`, + // target: `https://z.csgmall.com.cn`, - // target: `http://10.40.92.8:8080`,//超 + target: `http://10.40.92.8:8080`,//超 // target: `http://10.40.92.253:8080`,//韩 // target: `http://10.40.92.209:8080`,//川/ @@ -52,7 +52,8 @@ module.exports = { //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0; //3.只有南网项目产线gl发布打包时候需要注意： // 将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api'; - // 登录跳转地址从/login换成/gl/login; + // router/indx.js 中base放开 + // 登录跳转地址从/login换成/gl/login 3处; //4. 重庆环境的时候需要将领料管理线上菜单修改 //******** 注意事项 ********* */