whycq
2024-05-27 cb1db468bcaa90e9a0e2e4aee192088e9370ac52
Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
3个文件已修改
22 ■■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-openapi/src/main/webapp/views/md/createMat.md 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
@@ -158,4 +158,7 @@
    //存货核算
    private String inventoryAccount;
    //商品分类
    private String shopCategory;
}
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -247,6 +247,24 @@
            mat.setMatnr(matParam.getMatnr());//物料号
            mat.setHostId(hostId);//仓库ID
            mat.setTagId(tag.getId());//分类ID
            if (!Cools.isEmpty(matParam.getShopCategory())) {
                Tag shopTag = tagService.getOne(new LambdaQueryWrapper<Tag>()
                        .eq(Tag::getName, matParam.getShopCategory())
                        .eq(Tag::getHostId, hostId));
                if (shopTag == null) {
                    //商品分类为空,创建商品分类
                    shopTag = new Tag();
                    shopTag.setName(matParam.getShopCategory());
                    shopTag.setParentId(tag.getId());
                    shopTag.setStatus(1);
                    shopTag.setHostId(hostId);
                    shopTag.setCreateTime(new Date());
                    shopTag.setUpdateTime(new Date());
                    tagService.save(shopTag);
                }
                mat.setTagId(shopTag.getId());//分类ID
            }
            if (!Cools.isEmpty(matParam.getMaktx())) {
                mat.setMaktx(matParam.getMaktx());
            }
zy-asrs-openapi/src/main/webapp/views/md/createMat.md
@@ -48,6 +48,7 @@
&emsp;&emsp;accountingClass                |string        |可选            |会计分类
&emsp;&emsp;batch                |string        |可选            |批号管理
&emsp;&emsp;inventoryAccount                |string        |可选            |存货核算
&emsp;&emsp;shopCategory                |string        |可选            |商品分类
&emsp;sign                |string        |可选            |签名