Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

zc

2024-09-13 ec8120682339a7b9feb64748320781e99fa0cb77

Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

 src/main/java/com/zy/third/erp/task/ERPItemService.java

@@ -77,10 +77,14 @@
                    }
                }
            }
            priTag = tagService.selectByName(itemTB.getItemKind(), 2);
            mat = sync(mat, itemTB);
            if (!Cools.isEmpty(itemTB.getItemKind())) {
                priTag = tagService.selectByName(itemTB.getItemKind(), 2);
            }

            mat.setTagId(priTag.getId());
            mat = sync(mat, itemTB);
            if (priTag!=null){
                mat.setTagId(priTag.getId());
            }
            mat.setStatus(1);
            mat.setCreateTime(now);
            mat.setUpdateTime(now);