Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -735,6 +735,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     //校验车间代号
                     if (ObjectUtil.isNotEmpty(equDo.getProcessworkshopid())) {
                         if (workShopMap.containsKey(equDo.getProcessworkshopid())) {
+                            if(ObjectUtil.isEmpty(workShopMap.get(equDo.getProcessworkshopid()))){
+                                return R.error("加工车间" + equDo.getProcessworkshop() + "代号不能为空");
+                            }
                             String workShopCode = workShopMap.get(equDo.getProcessworkshopid()).toString();
                             if (ObjectUtil.isEmpty(workShopCode) || workShopCode.length() != 1) {
                                 return R.error("加工车间" + equDo.getProcessworkshop() + "代号不能为空");