DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-08-04 09:19:05 +08:00
parent 8ba27c402f add77d477e
commit 6c3509e85a
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
klp-ui/src/views/wms/purchasePlan/panels/merger.vue
View File

@@ -33,6 +33,7 @@
import { addBomItem } from '@/api/wms/bomItem' import { addBomItem } from '@/api/wms/bomItem'
import { addBom } from '@/api/wms/bom' import { addBom } from '@/api/wms/bom'
import { updateRawMaterial, addRawMaterial, getRawMaterial } from '@/api/wms/rawMaterial' import { updateRawMaterial, addRawMaterial, getRawMaterial } from '@/api/wms/rawMaterial'
import { updatePurchasePlanDetail } from '@/api/wms/purchasePlanDetail'
export default { export default {
name: 'Merger', name: 'Merger',

4
klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
View File

@@ -72,8 +72,8 @@ public class WmsRawMaterialController extends BaseController {
@Log(title = "原材料", businessType = BusinessType.INSERT) @Log(title = "原材料", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsRawMaterialBo bo) { public R<WmsRawMaterialBo> add(@Validated(AddGroup.class) @RequestBody WmsRawMaterialBo bo) {
return toAjax(iWmsRawMaterialService.insertByBo(bo)); return R.ok(iWmsRawMaterialService.insertByBo(bo));
} }
/** /**

2
klp-wms/src/main/java/com/klp/service/IWmsRawMaterialService.java
View File

@@ -35,7 +35,7 @@ public interface IWmsRawMaterialService {
/** /**
* 新增原材料 * 新增原材料
*/ */
Boolean insertByBo(WmsRawMaterialBo bo); WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo);
/** /**
* 修改原材料 * 修改原材料

4
klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
View File

@@ -195,14 +195,14 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
* 新增原材料 * 新增原材料
*/ */
@Override @Override
public Boolean insertByBo(WmsRawMaterialBo bo) { public WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo) {
WmsRawMaterial add = BeanUtil.toBean(bo, WmsRawMaterial.class); WmsRawMaterial add = BeanUtil.toBean(bo, WmsRawMaterial.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setRawMaterialId(add.getRawMaterialId()); bo.setRawMaterialId(add.getRawMaterialId());
} }
return flag; return bo;
} }
/** /**

8
klp-wms/src/main/java/com/klp/service/impl/WmsSalesScriptGeneratorServiceImpl.java
View File

@@ -1,28 +1,20 @@
package com.klp.service.impl; package com.klp.service.impl;
import com.klp.common.config.DeepseekConfig; import com.klp.common.config.DeepseekConfig;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.utils.StringUtils; import com.klp.common.utils.StringUtils;
import com.klp.domain.bo.WmsSalesScriptGeneratorBo; import com.klp.domain.bo.WmsSalesScriptGeneratorBo;
import com.klp.domain.vo.WmsProductSalesScriptVo; import com.klp.domain.vo.WmsProductSalesScriptVo;
import com.klp.domain.vo.WmsProductVo; import com.klp.domain.vo.WmsProductVo;
import com.klp.domain.vo.WmsProductBomVo;
import com.klp.domain.WmsProductBom; import com.klp.domain.WmsProductBom;
import com.klp.service.IWmsSalesScriptGeneratorService; import com.klp.service.IWmsSalesScriptGeneratorService;
import com.klp.service.IWmsProductService; import com.klp.service.IWmsProductService;
import com.klp.service.IWmsProductBomService; import com.klp.service.IWmsProductBomService;
import com.klp.service.IWmsProductSalesScriptService;
import com.klp.common.utils.redis.RedisUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;